flat: 石河子项目重置

App.vue

@@ -1,96 +1,139 @@
 <style lang="scss">
-    /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-    @import "@/uni_modules/uview-ui/index.scss";
+/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+@import '@/uni_modules/uview-ui/index.scss';
 </style>
 <script>
-    import website from '@/config/website.js'
-    import {
-        mapGetters
-    } from 'vuex'
-    // #ifdef H5
-    import {
-        setPlatformByHostName
-    } from '@/untils/customized.js'
-    // #endif
+import website from '@/config/website.js';
+import { mapGetters } from 'vuex';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+// #ifdef H5
+import { setPlatformByHostName } from '@/untils/customized.js';
+import { reject } from 'lodash';
+// #endif
 
-    export default {
-        onLaunch: function(options) {
-            this.$store.dispatch('InitArea')
+export default {
+    onLaunch: function (options) {
+        this.$store.dispatch('InitArea');
         if (options.query.token) {
-                uni.reLaunch({
-                    url: '/pages/login/blank?token=' + options.query.token
-                })
-            } else if (this.$store.state.user.token) {
-                this.$store.dispatch('startRefreshTokenTimer')
-                this.$store.dispatch('startRefreshNewsTimer')
-                this.$store.dispatch('refreshAuthState')
-                this.$store.dispatch('getUserLocation')
-                this.$store.dispatch('getMobileIsCms')
+            this.tokenlogin(options.query.token).then(() => {
+                this.$store.dispatch('getUserLocation');
+                this.$store.dispatch('getNoticeState');
+                this.$store.dispatch('getMobileIsCms');
+                this.$store.dispatch('getResumeInfo');
+            });
+        } else {
+            this.$store.dispatch('FedLogOut');
         }
+        // if (options.query.token) {
+        //     // uni.reLaunch({
+        //     //     url: '/pages/login/blank?token=' + options.query.token
+        //     // })
+        //     this.tokenlogin(options.query.token)
+        // } else if (this.$api.haslogin()) {
+        //     this.$store.dispatch('startRefreshTokenTimer')
+        //     this.$store.dispatch('startRefreshNewsTimer')
+        //     this.$store.dispatch('refreshAuthState')
+        //     this.$store.dispatch('getUserLocation')
+        //     this.$store.dispatch('getMobileIsCms')
+        // }
         // #ifdef H5
         // 企业定制
-            setPlatformByHostName(this.$store)
+        setPlatformByHostName(this.$store);
         // #endif
     },
-        onShow: function() {},
-        onHide: function() {},
+    onShow: function () {},
+    onHide: function () {},
     computed: {
-            ...mapGetters(['news']),
+        ...mapGetters(['news', 'auth']),
         allUnread() {
-                return this.news.allUnread
-            }
+            return this.news.allUnread;
+        },
     },
     mounted() {
         this.$config.showTitle && document.documentElement.style.setProperty('--hide-title', 'block');
     },
+    methods: {
+        tokenlogin(token) {
+            return new Promise((resolve, reject) => {
+                uni.showLoading({
+                    title: '登录中',
+                });
+                if (token) {
+                    const that = this;
+                    this.$store
+                        .dispatch('LoginByUsername', {
+                            username: 'admin',
+                            password: 'admin',
+                            key: '',
+                            code: '1111',
+                            type: 'account',
+                            token: token,
+                            tenantId: website.tenantId,
+                        })
+                        .then((resp) => {
+                            this.$store.dispatch('refreshAuthState').then(() => {
+                                uni.hideLoading();
+                                resolve();
+                            });
+                        })
+                        .catch((err) => {
+                            uni.hideLoading();
+                        });
+                } else {
+                    GoLogin();
+                }
+            });
+        },
+    },
     watch: {
         allUnread(value) {
-                console.log('allUnread', value)
-                if (!this.$store.state.user.token) {} else if (value > 0) {
+            console.log('allUnread', value);
+            if (!this.$api.haslogin()) {
+            } else if (value > 0) {
                 uni.showTabBarRedDot({
-                        index: 2
-                    })
+                    index: 2,
+                });
                 uni.$once('newsReadChange', () => {
                     uni.showTabBarRedDot({
-                            index: 2
-                        })
-                    })
+                        index: 2,
+                    });
+                });
             } else {
                 uni.hideTabBarRedDot({
-                        index: 2
-                    })
+                    index: 2,
+                });
                 uni.$once('newsReadChange', () => {
                     uni.hideTabBarRedDot({
-                            index: 2
-                        })
-                    })
+                        index: 2,
+                    });
+                });
             }
-            }
-        }
-    };
+        },
+    },
+};
 </script>
 
 <style lang="scss">
-    /*每个页面公共css */
-    /* tabbar 字体大小 */
-    /* .uni-tabbar__label{
+/*每个页面公共css */
+/* tabbar 字体大小 */
+/* .uni-tabbar__label{
 	font-size: 14px !important;
 	} */
-    @font-face {
+@font-face {
     font-family: 'uicon-iconfont';
     font-weight: mormal;
     font-style: mormal;
     src: url('/static/font/font_2225171_8kdcwk4po24.ttf') format('truetype');
-    }
+}
 
-    :root {
+:root {
     --hide-title: none;
-    }
+}
 
-    /* #ifdef H5 */
-    uni-page-head {
+/* #ifdef H5 */
+uni-page-head {
     display: var(--hide-title);
-    }
+}
 
-    /* #endif */
+/* #endif */
 </style>

api/auth.js

@@ -1,14 +1,34 @@
 import {
     request
 } from '@/untils/AxiosUtils.js';
+import {
+    decryptJson
+} from '@/untils/authService.js'
 import website from "@/config/website";
 
 const authUrl = '/api/jobslink-api/user/user/auth/auth'
 
-export const findAuth = () => request({
+// export const findAuth = () => request({
+//     url: '/api/jobslink-api/user/user/find',
+//     method: 'get'
+// });
+
+export const findAuth = async () => {
+    try {
+        const encrypted = await request({
             url: '/api/jobslink-api/user/user/find',
-	method: 'get'
-});
+            method: 'get',
+            responseType: 'text', // 接收纯文本密文
+        });
+        const decryptedStr = decryptJson(encrypted.data);
+        return {
+            data: JSON.parse(decryptedStr),
+        };
+    } catch (error) {
+        console.error('请求或解密过程中出错:', error);
+        return null;
+    }
+};
 
 export const cheakValue = () => request({
     url: authUrl,
@@ -103,7 +123,7 @@ export const viewContract = (params) => request({
 });
 
 //新实名认证api
-export const newCertification = (bakvalue, realName, idNumber, cardNumber, bankCode,def,bankName) => request({
+export const newCertification = (bakvalue, realName, idNumber, cardNumber, bankCode, def, bankName) => request({
     url: '/api/jobslink-api/user/user/auth/authNew',
     method: 'post',
     data: {
@@ -116,3 +136,9 @@ export const newCertification = (bakvalue, realName, idNumber, cardNumber, bankC
         bankName
     }
 });
+// 电话联系
+export const getPhoneCountNumber = (params) => request({
+    url: "/api/jobslink-api/serve/phone",
+    method: 'get',
+    data: params
+});

api/federation.js

@@ -27,15 +27,21 @@ export const contract = (params) => request({
 export const labourUnionDetail = (no) => request({
     url: "/api/jobslink-api/doc/jkLabourUnionAppl/list",
     method: 'get',
-	params:{no}
+    params: {
+        no
+    }
 });
 //提交会员申请
-export const saveApplication = (labourunionId,applType,applComment) =>{
-		applComment=applComment.substring(0,200)
+export const saveApplication = (labourunionId, applType, applComment) => {
+    applComment = applComment.substring(0, 200)
     return request({
         url: "/api/jobslink-api/doc/jkLabourUnionDetail/save",
         method: 'post',
-		data:{labourunionId,applType,applComment}
+        data: {
+            labourunionId,
+            applType,
+            applComment
+        }
     });
 }
 
@@ -43,5 +49,7 @@ export const saveApplication = (labourunionId,applType,applComment) =>{
 export const applicationInfo = (no) => request({
     url: "/api/jobslink-api/doc/jkLabourUnionDetail/list",
     method: 'get',
-	params:{no}
+    params: {
+        no
+    }
 });

api/mission.js

@@ -307,3 +307,9 @@ export const getPolicyContentList = (params) => request({
     method: 'get',
     params
 })
+
+export const userWorkSearchListAll = (params) => request({
+    url: '/api/jobslink-api/user/userWork/searchListAll',
+    method: 'get',
+    params
+})

api/resume.js

@@ -59,6 +59,7 @@ export const setResume = ({
     wage,
     workplace,
     telephone,
+	wageUpper,
     workExperience
 }) => {
     return request({
@@ -70,7 +71,8 @@ export const setResume = ({
             wage,
             workplace,
             telephone,
-            workExperience
+            workExperience,
+			wageUpper,
         },
     });
 };

api/user.js

@@ -73,3 +73,13 @@ export const mobileIsCms = () => request({
     url: '/api/jobslink-api/mobile/isCms',
     method: 'get'
 })
+
+export const noticeIsEnable = () => request({
+    url: "/api/jobslink-api/desk/notice/isEnable",
+    method: 'get',
+});
+
+export const setNoticeIsEnable = (state) => request({
+    url: "/api/jobslink-api/desk/notice/isEnable/" + state,
+    method: 'PUT',
+});

components/CustomTabbar/custom_tabbar.vue

@@ -65,6 +65,12 @@
 				// uni.switchTab({
 				// 	url: item.path
 				// })
+				if (item.id === 1) {
+					return uni.showToast({
+						icon: "none",
+						title: '系统正在升级完善',
+					})
+				}
                 uni.navigateTo({
                     url: item.path
                 })

components/companyList/applyList.vue

@@ -7,7 +7,8 @@
             </view>
 
             <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+                {{ companyitem.wage }}
+				
             </view>
 
         </view>

components/companyList/collectionList.vue

@@ -34,7 +34,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)">
@@ -57,6 +57,10 @@
         dateFormat
     } from "../../untils/format.js";
     import dictionary from '@/common/textdata.js';
+    import {
+        addZeroPrefix,
+        getDistanceFromLatLonInKm
+    } from '@/untils/tools.js'
     import {
         defaults
     } from "lodash";
@@ -81,7 +85,8 @@
             near: {
                 type: Boolean,
                 default: false
-            }
+            },
+            location: Object
         },
         data() {
             return {
@@ -101,6 +106,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)}`

components/companyList/companyList.vue

@@ -7,7 +7,9 @@
             </view>
 
             <view class="head_right">
-                {{ companyitem.wage }} {{ wageUnit[companyitem.wageUnitCategory] }}
+                {{ companyitem.wage }}
+				<!-- 后台处理 单位-->
+				<!-- {{ wageUnit[companyitem.wageUnitCategory] }} -->
             </view>
         </view>
         <view class="ask">

components/companyList/workList.vue

@@ -7,7 +7,7 @@
             </view>
 
             <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+                {{ companyitem.wage }}~{{companyitem.wageUpper}}{{ wageUnit[companyitem.wageUnitCategory] }}
             </view>
         </view>
         <view class="ask">
@@ -90,7 +90,8 @@
             near: {
                 type: Boolean,
                 default: false
-            }
+            },
+            position: Object,
         },
         data() {
             return {

components/sylj-selectLocation/seeLocation.vue

@@ -130,7 +130,7 @@
                 if (this.option && this.option.apikey) {
                     const script = document.createElement('script')
                     // view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-                    script.src = 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
+                    script.src = 'https://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
                     script.onload = this.initEcharts.bind(this)
                     document.head.appendChild(script)
                 }
@@ -145,7 +145,7 @@
                 if (this.option.apikey) {
 
                     const script = document.createElement('script')
-                    script.src = 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
+                    script.src = 'https://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
 
                     script.onload = this.initEcharts.bind(this)
                     document.head.appendChild(script)

components/sylj-selectLocation/sylj-selectLocation.vue

@@ -193,7 +193,7 @@
                 if (this.option && this.option.apikey) {
                     const script = document.createElement('script')
                     // view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-                    script.src = 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
+                    script.src = 'https://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
 
                     script.onload = this.initEcharts.bind(this)
                     document.head.appendChild(script)
@@ -212,7 +212,7 @@
                 if (this.option.apikey) {
 
                     const script = document.createElement('script')
-                    script.src = 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
+                    script.src = 'https://api.tianditu.gov.cn/api?v=4.0&tk=' + this.option.apikey
 
                     script.onload = this.initEcharts.bind(this)
                     document.head.appendChild(script)

components/sylj-selectLocation/tmap.vue

@@ -133,7 +133,7 @@
                     mask: true
                 })
                 uni.request({
-                    url: 'http://api.tianditu.gov.cn/v2/search',
+                    url: 'https://api.tianditu.gov.cn/v2/search',
                     method: 'GET',
                     data: params,
                     success: res => {
@@ -257,7 +257,6 @@
                         tk: e.apikey
                     },
                     success: res => {
-                        //console.log(res);
                         if (res.data.result) {
                             const value = that.formatterAdressLocation(res.data.result, 1)
                             that.arr_list = [value]
@@ -269,7 +268,36 @@
                         }
                     },
                     fail: () => {
-                        //console.log('获取失败')
+                        if (window.location.origin.search('localhost') >= 0 || window.location.origin
+                            .search('10.165.0.173') >= 0) { // 测试环境
+                            const value = that.formatterAdressLocation({
+                                "formatted_address": "四川省德阳市广汉市西高镇李家院子东北约95米",
+                                "location": {
+                                    "lon": 104.20046,
+                                    "lat": 31.0513
+                                },
+                                "addressComponent": {
+                                    "address": "李家院子",
+                                    "town": "高坪镇",
+                                    "nation": "中国",
+                                    "city": "德阳市",
+                                    "county_code": "156510681",
+                                    "poi_position": "东北",
+                                    "county": "广汉市",
+                                    "city_code": "156510600",
+                                    "address_position": "东北",
+                                    "poi": "李家院子",
+                                    "province_code": "156510000",
+                                    "town_code": "156510681103",
+                                    "province": "四川省",
+                                    "road": "洛小路",
+                                    "road_distance": 126,
+                                    "address_distance": 95,
+                                    "poi_distance": 95
+                                }
+                            }, 1)
+                            that.arr_list = [value]
+                        }
                     },
                     complete: () => {
                         uni.hideLoading();

config.js

@@ -6,6 +6,8 @@ module.exports = {
     apiKey: 'e4266a5e84fe6c10f60c559967f0a03f',
     // 显示标题
     showTitle: false,
+    loginURl: 'https://dy12333.org.cn/h5/#/pages/qyPackge/user/login/login',
+    AESKey: 'mL8na90u+5hoa/HKiMinvA==',
     // map 1、黑色模块 2、白色模块
     // supperMap: 'http://10.165.0.44:1205/proxy/rest/maps/f346b6c59dc64d5793713cf384fab78d/33cbaa14370449a08588f1074ecfec67',
     // supperMap: 'http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768',

main.js

@@ -8,6 +8,9 @@ import tools from '@/untils/tools.js'
 import {
     VueJsonp
 } from 'vue-jsonp'
+import {
+    GoLogin
+} from '@/untils/AxiosUtils.js';
 // 注册全局组件
 // import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue"
 // import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue"
@@ -16,9 +19,21 @@ import {
 
 import empty from '@/components/empty/empty.vue'
 
+function haslogin() {
+    return !!store.state.user.token
+}
+
+function hasResume() { // 是否填写简历
+    const data = store.state.user.resumeInfo
+    if (!(data.education && data.telephone && data.wage && data.workplace)) {
+        return false
+    }
+    return true
+}
+
 function navTo(url, needLogin) {
-    console.log(url)
-    if (needLogin) {
+    if (needLogin && !haslogin()) {
+        GoLogin()
         return
     }
     uni.navigateTo({
@@ -26,6 +41,7 @@ function navTo(url, needLogin) {
     })
 }
 
+
 const msg = (title, duration = 1500, mask = false, icon = 'none') => {
     uni.showToast({
         title,
@@ -50,7 +66,9 @@ Vue.component('super-map', superMapView)
 Vue.component('empty', empty)
 Vue.prototype.$api = {
     msg,
-    sleep
+    sleep,
+    haslogin,
+    hasResume
 }
 Vue.prototype.tools = tools
 Vue.prototype.$config = config

manifest.json

@@ -1,21 +1,22 @@
 {
-    "name": "招聘",
-    "appid": "__UNI__2BC0F87",
-    "description": "",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": false,
-    "app-plus": {
-        "usingComponents": true,
-        "compilerVersion": 3,
+    "name" : "招聘",
+    "appid" : "__UNI__120CBFC",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "sassImplementationName" : "node-sass",
+    "app-plus" : {
+        "usingComponents" : true,
+        "compilerVersion" : 3,
         /* 5+App特有相关 */
-        "modules": {},
+        "modules" : {},
         /* 模块配置 */
-        "distribute": {
+        "distribute" : {
             /* 应用发布信息 */
-            "android": {
+            "android" : {
                 /* android打包配置 */
-                "permissions": [
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -40,45 +41,41 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios": {},
+            "ios" : {},
             /* ios打包配置 */
-            "sdkConfigs": {}
+            "sdkConfigs" : {}
         }
     },
     /* SDK配置 */
-    "quickapp": {},
+    "quickapp" : {},
     /* 快应用特有相关 */
-    "mp-weixin": {
+    "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid": "wx77580889aaf15eb4",
-        "setting": {
-            "urlCheck": false,
-            "minified": true,
-            "es6": true
+        "appid" : "wx77580889aaf15eb4",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
         },
-        "usingComponents": true,
-        "permission": {
-            "scope.userLocation": {
-                "desc": "获取您的位置，以便给您推荐合适工作信息"
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置，以便给您推荐合适工作信息"
             }
         }
     },
-    "h5": {
-        "sdkConfigs": {
-            "maps": {
-                "qqmap": {
-                    "key": "FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI"
-                }
-            }
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
         },
-        "template": "index.html",
-        "router": {
-            "base": "./",
-            "mode": "hash"
+        "template" : "index.html",
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
         },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
             }
         }
     }

package-lock.json

@@ -1805,6 +1805,11 @@
       "resolved": "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz",
       "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
     },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "csscolorparser": {
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/csscolorparser/-/csscolorparser-1.0.3.tgz",

package.json

@@ -18,6 +18,7 @@
     "license": "ISC",
     "dependencies": {
         "@supermap/iclient-ol": "^11.1.1",
+        "crypto-js": "^4.2.0",
         "decimal.js": "^10.2.0",
         "js-base64": "^2.4.9",
         "js-md5": "^0.7.3",

pageMy/apply/rights.vue

@@ -36,7 +36,7 @@
 			}
 		},
 		onShow() {
-			if (!this.$store.state.user.token){
+			if (!this.$api.haslogin()){
 				//modalTitle, content, whetherCancel, confirmText, pageUrl, cancelUrl
 				showUniModal('提示','您还未登录，点击确认去登录',true,'确定','/pages/login/login','/pages/index/index')
 			}else{

pageMy/my/resume/addSkill.vue

@@ -91,7 +91,7 @@
             }) => {
                 console.log('detail,', detail)
                 // this.skillsId = id
-                this.skillsName = `${detail.parentLabel}-${detail.parentTwoLabel}-${detail.label}`
+                this.skillsName = `${detail.parentLabel}-${detail.label}`
             })
         },
         methods: {
@@ -113,10 +113,12 @@
                 // }
             },
             skillLevel: function() {
-
 				uni.navigateTo({
-                    url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=3&type=2`
+                    url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}&maxLayer=2&type=2`
                 })
+                // uni.navigateTo({
+                //     url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=3&type=2`
+                // })
             },
             submit: async function() {
                 // console.log(this.tradeName, this.worktypesName, this.skillsName);

pageMy/my/resume/index.vue

@@ -31,8 +31,10 @@
                     <view class="list_text">
                         {{ item.worktypes }}、{{ item.skills }}
                     </view>
-                    <view>
-                        <image src="../../../static/img/left_right.png" mode=""></image>
+                    <view class="delt" @click="removeSkills(item.id, index)">
+						删除
+						<!-- 向右滑动删除 -->
+                        <!-- <image src="../../../static/img/left_right.png" mode=""></image> -->
                     </view>
                 </view>
             </m-slide-list>
@@ -75,16 +77,20 @@
             </view>
             <image src="../../../static/img/right.svg" mode=""></image>
         </view>
-        <view class="jobcontent" @click="showPickerFunc('wage')">
+		<!-- @click="showPickerFunc('wage')" -->
+        <view class="jobcontent" >
             <view class="jobinfo">
                 <view v-bind:class="['jobAddress', { 'input-error': !myResume.wage && isShowBorder }]">
                     我的期望薪资
                 </view>
-                <view v-bind:class="['jobText']">
-                    {{ myResume.wage ? myResume.wage : '请选择' }}
+                <view v-bind:class="['jobText', 'jobDis']">
+                    <!-- {{ myResume.wage ? myResume.wage : '请选择' }} -->
+					
+					<u--input type="number" border="none" @focus="change1" @change="change($event, 'wage')" :value="myResume.wage" placeholder="请输入期望薪资范围" class="jobNumber" /><span>~</span>
+					<u--input type="number" border="none" @focus="change1" @change="change($event, 'wageUpper')" :value="myResume.wageUpper" placeholder="请输入期望薪资范围" class="jobNumber"  /><span>元/月</span>
                 </view>
             </view>
-            <image src="../../../static/img/right.svg" mode=""></image>
+            <!-- <image src="../../../static/img/right.svg" mode=""></image> -->
         </view>
         <view class="jobcontent">
             <view class="jobinfo">
@@ -165,12 +171,15 @@
         <!-- 省市 -->
         <data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
             @close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
-            :defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
+            :defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true" :sourceData=areaData
             :labelName="areaModal.labelName"></data-picker>
     </view>
 </template>
 
 <script>
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     import {
         mapGetters
     } from 'vuex'
@@ -189,6 +198,8 @@
         cloneDeep,
         forIn
     } from 'lodash';
+	import area from "./province-city-county.json"
+	
     const validateForm = {
         name: '请输入企业名称',
         work: '请输入工作岗位',
@@ -215,6 +226,7 @@
                     education: {},
                     wage: "",
                     phone: "",
+					wageUpper: ''
                 },
                 mySkills: [],
                 id: undefined,
@@ -238,16 +250,26 @@
                     address: '',
                     addressShow: false,
                     title: 'Hello',
-                    // indexs: [0, 0, 8],
+                    indexs: [0,0],
                     // defaultIds: [1, 110000, 110106],
-                    defaultNames: ['北京市', '北京市', '东城区'],
+                    // defaultNames: ['北京市', '北京市', '东城区'],
+                    // defaultNames: ['德阳市', '旌阳区'],
                     labelName: "areaName"
 
                 },
+				areaData: []
             }
         },
         onShow() {
+            if (!this.$api.haslogin()) {
+                GoLogin()
+                return
+            }
             this.getSkill()
+			// this.areaData = area.find(i => i.id === 510000).children
+			const  areaObj = area.find(i => i.id === 510000).children
+			const areaObj1 = areaObj.find(i => i.id === 510600)
+			this.areaData = [areaObj1]
         },
         created() {
             this.getResume()
@@ -258,7 +280,7 @@
         watch: {
             myResume: {
                 handler: function(newVal, oldVal) {
-                    if (newVal.city && newVal.education && newVal.wage && newVal.phone) {
+                    if (newVal.city && newVal.education && newVal.wage && newVal.phone && newVal.wageUpper) {
                         this.canSubMit = true;
                     } else {
                         this.canSubMit = false;
@@ -340,6 +362,7 @@
                             label: data.education
                         },
                         wage: data.wage,
+						wageUpper: data.wageUpper,
                         phone: data.telephone
                     }
                     this.isShowButton = false;
@@ -478,6 +501,14 @@
                 this.isShowButton = true;
                 this.showPicker = true;
             },
+			change(e, type) {
+				console.log(type, e, '----')
+				this.myResume[type] = e
+				
+			},
+			change1(){
+				this.isShowButton = true;
+			},
             pickerButtonFunc(e) {
                 console.log(e, this.myResume, this.myResume[this.showType]);
                 this.myResume[this.showType] = e.value[0];
@@ -507,7 +538,8 @@
                     city,
                     education,
                     phone,
-                    wage
+                    wage,
+					wageUpper,
                 } = this.myResume
                 // 中国大陆手机号码正则表达式
                 const mobileRegex = /\b(1[3-9]\d{9})\b/;
@@ -515,7 +547,7 @@
                 const landlineRegex = /\b(0\d{2,3}-\d{7,8}(-\d{1,4})?)\b/;
 
                 const workList = JSON.stringify(this.gzList)
-
+				if (!wage || !wageUpper) return this.showToast("请正确填写薪资范围");
                 if (mobileRegex.test(phone) || landlineRegex.test(phone)) {
                     // 电话号码格式正确
                     console.log(phone, "电话号码格式正确");
@@ -525,10 +557,12 @@
                         workplace: city.workplace ? city.workplace : city.parentLabel + '-' + city.label,
                         telephone: phone,
                         wage,
+						wageUpper,
                         workExperience: workList
                     }).then(res => {
                         this.isShowButton = false;
                         this.getResume()
+                        this.$store.dispatch('getResumeInfo')
                         this.$api.msg('保存成功')
                     })
                 } else {
@@ -809,4 +843,48 @@
     .input-error {
         color: red;
     }
+	
+	.delt {
+		color: red;
+		font-size: 26rpx;
+	}
+	
+	.jobDis {
+		width: 100%;
+		display: flex;
+		height: 60rpx;
+		border: 1rpx solid #999999;
+		border-radius: 40rpx;
+		
+		span:nth-of-type(1) {
+			padding: 0 20rpx;
+			border: 1rpx solid #999999;
+			border-top: none;
+			border-bottom: none;
+		}
+		
+		span:nth-of-type(2) {
+			padding: 0 10rpx;
+			width: 80rpx;
+			font-size: 20rpx;
+			border-left: 1rpx solid #999999;
+		}
+	}
+	.jobNumber {
+		height: 60rpx;
+		padding-left: 16rpx;
+		/* border: 1rpx solid #999999; */
+		/* border-top: none;
+		border-bottom: none; */
+	}
+	
+	.uni-input-placeholder {
+		padding-left: 16rpx !important;
+	}
+	.uni-input-input, .uni-input-placeholder {
+		padding-left: 16rpx !important;
+	}
+	.u-input__content__field-wrapper__field  {
+		padding-left: 16rpx !important;
+	}
 </style>

pageMy/my/resume/skill.vue

@@ -1,15 +1,27 @@
 <template>
     <view>
+		<view class="search">
+			<input 
+				v-model="searchKeyword"
+				type="text"
+				class="search-input"
+				placeholder="请输入关键词搜索"
+				@input="handleSearch"
+				@focus="isSearchFocused = true"
+			    @blur="handleSearchBlur"
+			/>
+		</view>
 		<view class="title">
 		    全部
 		</view>
-        <block v-for="(item, index) in city" :key="index">
+        <block v-for="(item, index) in filteredResults" :key="index">
             <view class="cityList" @click="cityClick(item)">
                 {{ item.name }}
                 <image src="../../../static/img/correct.svg" v-if="id === item.id" mode=""></image>
                 <image v-else-if="layer !== maxLayer" src="../../../static/img/right.svg" mode=""></image>
             </view>
         </block>
+		
         <view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
         <view class="btn" v-if="layer === maxLayer" @click="comfirm">
             <view class="bottombtn">
@@ -38,6 +50,10 @@
                 label: '',
 
                 tradeId: '',
+				searchKeyword: '', // 模糊关键字搜索
+				isSearchFocused: true,
+				searchFields: ['name'],
+				type: 1
             }
         },
         computed: {
@@ -51,6 +67,19 @@
                 } else {
                     return this.workTypeList;
                 }
+            },
+			filteredResults() {
+			  if (!this.searchKeyword) {
+				return this.city
+			  }
+			  
+			  const keyword = this.searchKeyword.toLowerCase()
+			  return this.city.filter(item => {
+				return this.searchFields.some(field => {
+				  const value = this.getObjectValue(item, field)
+				  return value && value.toLowerCase().includes(keyword)
+				})
+			  })
 			}
         },
         mounted() {
@@ -64,12 +93,15 @@
             tradeId,
             parentId,
             layer,
-            maxLayer
+            maxLayer,
+			type
         }) {
             this.parentId = parentId
             this.tradeId = tradeId || 0
             this.layer = parseInt(layer || 1)
             this.maxLayer = parseInt(maxLayer || 2)
+			console.log(type, 'type')
+			this.type = type
         },
         onShow: function() {},
         methods: {
@@ -88,11 +120,14 @@
             },
             goCityInfo(item) {
                 uni.navigateTo({
-                    url: `./skill?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
+                    url: `./skill?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}&type=${this.type}`
                 })
             },
             comfirm: function() {
                 if (this.id) {
+					console.log(this.type)
+					if (this.type == '1') {
+						console.log('00000000')
 						uni.$emit('setworkTypes', {
 						    detail: {
 						        id: this.id,
@@ -100,6 +135,17 @@
 						        parentLabel: this.$route.query.parentLabel
 						    }
 						})
+					} else {
+						console.log('1111111')
+						uni.$emit('setSkill', {
+						    detail: {
+						        id: this.id,
+						        label: this.label,
+						        parentLabel: this.$route.query.parentLabel,
+						        parentTwoLabel: this.$route.query.parentTwoLabel
+						    },
+						})
+					}
                     uni.navigateBack({
                         delta: this.layer
                     })
@@ -111,6 +157,22 @@
                 }
             },
 			
+			// 模糊搜索
+			handleSearch() {
+				
+				console.log(this.searchKeyword)
+			},
+			// 失去焦点
+			handleSearchBlur() {
+				
+			},
+			// 获取对象深层值
+			getObjectValue(obj, path) {
+			    return path.split('.').reduce((current, key) => {
+			    return current && current[key] !== undefined ? current[key] : ''
+			    }, obj)
+			},
+
         }
     }
 </script>
@@ -186,4 +248,17 @@
     page {
         background-color: #fefefe;
     }
+	
+	.search {
+		width: 80%;
+		height: 60rpx;
+		margin: 10rpx auto;
+		border: 1rpx solid #dddddd;
+		border-radius: 40rpx;
+		padding-left: 30rpx;
+	}
+	.search-input {
+		width: 80%;
+		height: 60rpx;
+	}
 </style>

pageMy/myProject/myCollection.vue

@@ -7,7 +7,7 @@
         <block v-for="(page, pIndex) in data" :key="pIndex">
             <block v-for="(item, index) in page" :key="item.id">
                 <view class="probody">
-					<company-list :companyitem="item" :noApply="false"></company-list>
+                    <company-list :companyitem="item" :noApply="false" :location="userLocation"></company-list>
                     <view class="baddd"></view>
                     <!-- <block>
 						<image src="/static/img/tab.orange.svg" mode="" v-if="item.status === 1"></image>
@@ -33,7 +33,9 @@
     import {
         myCollection
     } from '@/api/mission.js';
-
+    import {
+        mapGetters
+    } from 'vuex'
     export default {
         components: {
             vTabs,
@@ -48,6 +50,9 @@
                 total: 0
             }
         },
+        computed: {
+            ...mapGetters(['userLocation']),
+        },
         onLoad: function() {
             this.init()
         },
@@ -63,11 +68,11 @@
             }
         },
         /*下拉刷新*/
-		onPullDownRefresh:function(){
+        onPullDownRefresh: function() {
             this.init()
         },
         methods: {
-			init(){
+            init() {
                 this.current = 1
                 this.data = []
                 this.getData()

pages/index/index.vue

@@ -191,16 +191,16 @@
             </view>
         </view>
 
-        <view class="info_market">
+        <!--   <view class="info_market">
             <view class="market_top">
                 <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">
             <view class="cardTips"
@@ -289,36 +289,26 @@
                 policyContentList: [],
                 policyType: 1,
                 swiperType: 1,
+                IsResume: true,
             };
         },
         onLoad: function(options) {
-            myResume().then(res => {
-                const data = res.data.data
-                if (!(data.education && data.telephone && data.wage && data.workplace)) {
-                    this.goures()
-                    this.$api.sleep(1000).then(() => {
-                        this.$api.msg('请输入基本信息')
-                    })
+            if (this.$api.haslogin()) {
+                this.$store.dispatch('getResumeInfo')
             }
-            })
         },
         onShow: function() {
-            if (!this.$store.state.user.token) {
-                uni.reLaunch({
-                    url: '/pages/login/login'
-                })
-                return
-            }
+            this.download()
+            this.getSwiperList()
+            this.getPolicy()
+            if (this.$api.haslogin()) {
                 this.$store.dispatch('refreshAuthState').then((e) => {
                     var auth = this.$store.state.auth
                     if (!auth.bankCardState) {
                         this.step()
                     }
                 })
-
-            this.download()
-            this.getSwiperList()
-            this.getPolicy()
+            }
         },
         onReady() {
             uni.setNavigationBarTitle({
@@ -394,11 +384,11 @@
                 })
             },
             download: function() {
-                this.isLogin = this.$store.state.user.token ? true : false;
+                this.isLogin = this.$api.haslogin() ? true : false;
                 newMission().then(res => {
                     this.companyList = res.data.data;
                 });
-                if (this.$store.state.user.token) {
+                if (this.$api.haslogin()) {
                     uni.$emit('newsReadChange')
                     this.$store.dispatch("getUnreadNum");
                     recMission().then(res => {
@@ -407,25 +397,7 @@
                 };
             },
             goLocation: function() {
-                if (!this.$store.state.user.token) {
-                    uni.showModal({
-                        title: '提示',
-                        content: '您还未登录，点击确认去登录',
-                        success: function(res) {
-                            if (res.confirm) {
-                                uni.redirectTo({
-                                    url: "/pages/login/login"
-                                });
-                            } else if (res.cancel) {
-                                return
-                            }
-                        }
-                    });
-                } else {
-                    uni.navigateTo({
-                        url: '../mapSeach/mapSeach'
-                    });
-                }
+                this.navTo('../mapSeach/mapSeach', true)
             },
             goResume: function() {
                 uni.navigateTo({
@@ -439,40 +411,16 @@
                 });
             },
             goures: function() {
-                if (!this.$store.state.user.token) {
-                    uni.showModal({
-                        title: '提示',
-                        content: '您还未登录，点击确认去登录',
-                        success: function(res) {
-                            if (res.confirm) {
-                                uni.redirectTo({
-                                    url: "/pages/login/login"
-                                });
-                            } else if (res.cancel) {
-                                return
-                            }
-                        }
-                    });
-                } else {
-                    uni.navigateTo({
-                        url: '/pageMy/my/resume/index'
-                    });
-                }
+                this.navTo('/pageMy/my/resume/index', true)
             },
             toNewTask() {
-                uni.navigateTo({
-                    url: `/pages/project/newProject?tabIndex=${0}`
-                });
+                this.navTo(`/pages/project/newProject?tabIndex=${0}`, false)
             },
             toNewWork() {
-                uni.navigateTo({
-                    url: `/pages/project/newProject?tabIndex=${1}`
-                });
+                this.navTo(`/pages/project/newProject?tabIndex=${1}`, false)
             },
             toNewProject() {
-                uni.navigateTo({
-                    url: `/pages/project/newProject?tabIndex=${2}`
-                });
+                this.navTo(`/pages/project/newProject?tabIndex=${2}`, false)
             },
             toArticleDetail(id) {
                 if (id) {
@@ -482,49 +430,11 @@
                 }
             },
             gouserSet: function() {
-                if (!this.$store.state.user.token) {
-                    uni.showModal({
-                        title: '提示',
-                        content: '您还未登录，点击确认去登录',
-                        success: function(res) {
-                            if (res.confirm) {
-                                uni.redirectTo({
-                                    url: "/pages/login/login"
-                                });
-                            } else if (res.cancel) {
-                                return
-                            }
-                        }
-                    });
-                } else {
-                    uni.navigateTo({
-                        url: '/pageMy/setUserBase/index'
-                    });
-                }
+                this.navTo('/pageMy/setUserBase/index', true)
             },
             goSeach: function() {
-                if (!this.$store.state.user.token) {
-                    uni.showModal({
-                        title: '提示',
-                        content: '您还未登录，点击确认去登录',
-                        success: function(res) {
-                            if (res.confirm) {
-                                uni.redirectTo({
-                                    url: '/pages/login/login'
-                                })
-                            } else if (res.cancel) {
-                                return
-                            }
-                        }
-                    });
-                } else {
-                    // if (this.keywords) {
-                    uni.navigateTo({
-                        url: '../seach/seach?keywords=' + this.keywords
-                    });
+                this.navTo('../seach/seach?keywords=' + this.keywords, true)
                 this.keywords = ''
-                    // }
-                }
             },
             getSwiperList() {
                 getSwiperList(this.swiperType).then(res => {
@@ -573,7 +483,7 @@
             padding: 24rpx;
 
             .top_log {
-                background: url(@/static/img/index/inLogo.png) no-repeat center center;
+                background: url(@/static/img/title-pg.png) no-repeat center center;
                 background-size: cover;
                 height: 60rpx;
                 width: 450rpx;
@@ -608,7 +518,7 @@
     }
 
     .home_logo {
-        background: url(@/static/img/index/inLogo.png) no-repeat center center;
+        background: url(@/static/img/title-pg.png) no-repeat center center;
         background-size: cover;
         height: 76rpx;
         width: 560rpx;

pages/login/blank.vue

@@ -7,6 +7,9 @@
     import {
         mapGetters
     } from 'vuex'
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     import website from '@/config/website.js'
     export default {
         data() {
@@ -17,7 +20,7 @@
         },
         onLoad(options) {
             uni.showLoading({
-                title: ''
+                title: '登录中'
             })
             if (options.token) {
                 const that = this
@@ -39,7 +42,6 @@
                         if (!auth.bankCardState) {
                             that.goSign(0)
                         } else {
-
                             uni.switchTab({
                                 url: '/pages/index/index'
                             })
@@ -50,9 +52,10 @@
                     // this.$refs.code.refushCode()
                 });
             } else {
-                uni.reLaunch({
-                    url: '/pages/login/login'
-                })
+                // uni.reLaunch({
+                //     url: '/pages/login/login'
+                // })
+                GoLogin()
             }
         },
         method: {

pages/login/login.vue

@@ -6,7 +6,8 @@
 		</view> -->
         <!--  #endif -->
         <jl-input type="text" v-model="phone" placeholder="请输入手机号" @confirm="login"></jl-input>
-		<jl-input type="text" v-model="password" placeholder="请输入登录密码" @confirm="login" showPassword clearable></jl-input>
+        <jl-input type="text" v-model="password" placeholder="请输入登录密码" @confirm="login" showPassword
+            clearable></jl-input>
         <!-- <code-input ref="code" v-model="code" :getCode="getCaptcha" @key-change="keyChange" @confirm="login"></code-input> -->
         <view v-if="loading" class="btn nocheck" loading="true"></view>
         <view v-else-if="validate" class="btn" @click="login">立即登录</view>
@@ -58,7 +59,7 @@
             wx.hideHomeButton();
             //#endif
             this.password = ''
-			if (this.$store.state.user.token) {
+            if (this.$api.haslogin()) {
                 this.$store.dispatch('LogOut').then(() => {
                     this.$store.dispatch('clearAuthState')
                     this.$store.dispatch('endRefreshNewsTimer')

pages/mapSeach/mapSeach.vue

@@ -4,7 +4,8 @@
             <!-- 这里是状态栏 -->
         </view>
         <view class="head">
-			<map id='midMap' ref='midMap' :latitude="latitude" :markers="markList" :longitude="longitude" @tap="changeMap" scale="10">
+            <map id='midMap' ref='midMap' :latitude="latitude" :markers="markList" :longitude="longitude"
+                @tap="changeMap" scale="10">
             </map>
             <view class="search">
                 <view class="head_border">
@@ -25,7 +26,8 @@
                 附近零工岗位
             </view>
             <view class="borderbom"></view>
-			<scroll-view scroll-y lower-threshold="0" style="height: 92%;" @scrolltolower="upLoad" v-if="companyList.length>0">
+            <scroll-view scroll-y lower-threshold="0" style="height: 92%;" @scrolltolower="upLoad"
+                v-if="companyList.length>0">
                 <block v-for="(item, index) in companyList" :key="item.id">
                     <companyList :companyitem="item" :near="true"></companyList>
                     <view class="baddd"></view>
@@ -133,7 +135,7 @@
             getLocation: function() {
                 var that = this;
                 uni.getLocation({
-					type: 'gcj02',
+                    type: 'wgs84',
                     success: function(res) {
                         //初始化当前点
                         var point = {
@@ -186,7 +188,8 @@
                 var location = point.latitude + ',' + point.longitude
                 that.setCurrentMarker(point); //设置当前marker
                 getcoder(location, encodeURI(that.key), 0).then(res => {
-					var address = res.data.result.address_component.city + res.data.result.formatted_addresses.recommend;
+                    var address = res.data.result.address_component.city + res.data.result
+                        .formatted_addresses.recommend;
                     this.markList.forEach(ele => { //给当前marker添加label
                         if (ele.id === 0) {
                             ele.title = address;

pages/my/my.vue

@@ -6,12 +6,13 @@
                 <image v-else src="../../static/img/head.svg" mode=""></image>
                 <view class="userRight">
                     <view class="userTel" v-if="userInfo.user_name">
-                        {{ auth.authInfo.realName ? auth.authInfo.realName :
-					phoneFilter(userInfo.user_name) }}
+                        {{ auth.authInfo.realName ? auth.authInfo.realName : phoneFilter(userInfo.user_name) }}
                     </view>
-                    <view class="userTel" v-else> </view>
+                    <view class="userTel" v-else></view>
                     <view class="userContent">
-                        <view style="margin-right: 40rpx;">实名认证：{{ auth.realNameState ? '已认证' : '未认证' }}</view>
+                        <view style="margin-right: 40rpx">
+                            实名认证：{{ auth.realNameState ? '已认证' : '未认证' }}
+                        </view>
                         <!-- <view>银行卡核验：{{auth.bankCardState?'已认证':'未认证'}}</view> -->
                     </view>
                 </view>
@@ -39,7 +40,7 @@
 				</view> -->
             </view>
         </view>
-        <view style="height: 104rpx;"></view>
+        <view style="height: 104rpx"></view>
         <!-- <view class="federation">
 			<view>新业态职工工会联合会</view>
 			<view v-if="!federationStatus" class="forMembership" @click="go('/pageMy/federation/forMembership/Notice')">申请入会</view>
@@ -77,6 +78,11 @@
                 投诉建议
                 <image src="../../static/img/right.svg" mode=""></image>
             </view>
+            <view class="btnList">
+                <image src="../../static/img/vip.svg" mode=""></image>
+                消息提醒
+                <switch class="imgswitch" :checked="user.isEnbleNotice" @change="switch1Change" />
+            </view>
             <template v-if="user.userIsCms">
                 <view class="btnList" @click="navTo('/pageMy/admin/check')">
                     <image src="../../static/img/check1.png" mode=""></image>
@@ -113,54 +119,63 @@
         <!-- <view class="btn-out" @click="logout">
 			退出登录
 		</view> -->
-        <view class="bottom" @click="makePhoneCall">
+       <!-- <view class="bottom" @click="makePhoneCall">
             <view>德阳市人社局 电话：0838-2505580</view>
             <view>地址：德阳市旌阳区天山南路1段-102号</view>
-        </view>
+        </view> -->
         <cs-button></cs-button>
     </view>
 </template>
 
 <script>
-    import {
-        mapState,
-        mapGetters
-    } from 'vuex'
-    import {
-        phoneFilter,
-        stringFilterNum
-    } from '@/untils/format.js'
-    import {
-        labourUnionInfo
-    } from '@/api/federation.js'
-    export default {
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { mapState, mapGetters } from 'vuex';
+import { phoneFilter, stringFilterNum } from '@/untils/format.js';
+import { labourUnionInfo } from '@/api/federation.js';
+export default {
     data() {
         return {
-                federationStatus: false
-            }
+            federationStatus: false,
+        };
     },
     onLoad() {
-            this.$store.dispatch('getMobileIsCms')
-            // if (this.$store.state.user.token && this.authPass) {
+        // this.$store.dispatch('getMobileIsCms')
+        // if (this.$api.haslogin() && this.authPass) {
         // 	this.$store.dispatch('getVipCode')
         // }
     },
     onShow() {
-            if (!this.$store.state.user.token) {
-                uni.redirectTo({
-                    url: '/pages/login/login'
-                })
+        if (/token/g.test(location.href)) {
+            this.$api.sleep(2000).then(() => {
+                if (!this.$api.haslogin()) {
+                    GoLogin();
                 } else {
-                uni.$emit('newsReadChange')
-                this.$store.dispatch('refreshAuthState')
+                    uni.$emit('newsReadChange');
+                    this.$store.dispatch('refreshAuthState');
+                }
+            });
+        } else {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+            } else {
+                uni.$emit('newsReadChange');
+                this.$store.dispatch('refreshAuthState');
+            }
         }
         // this.labourUnionInfoInit()
     },
     methods: {
+        switch1Change(e) {
+            if (e.detail.value) {
+                this.$store.dispatch('setNoticeOpen');
+            } else {
+                this.$store.dispatch('setNoticeClose');
+            }
+        },
         labourUnionInfoInit() {
-                labourUnionInfo().then(e => {
-                    this.federationStatus = e.data.data.joined
-                })
+            labourUnionInfo().then((e) => {
+                this.federationStatus = e.data.data.joined;
+            });
         },
         // logout() {
         // 	this.$store.dispatch('LogOut').then(() => {
@@ -174,59 +189,59 @@
         // },
         go(url) {
             uni.navigateTo({
-                    url
-                })
+                url,
+            });
         },
-            makePhoneCall: function() {
+        makePhoneCall: function () {
             uni.makePhoneCall({
-                    phoneNumber: "18500206848"
-                })
+                phoneNumber: '18500206848',
+            });
         },
         phoneFilter,
-            stringFilterNum
+        stringFilterNum,
     },
     computed: {
         ...mapState(['user']),
-            ...mapGetters(['userInfo', 'auth', 'authPass'])
-        }
-    }
+        ...mapGetters(['userInfo', 'auth', 'authPass']),
+    },
+};
 </script>
 
 <style>
-    page {
+page {
     height: 100%;
     background: #f6f6f6;
-    }
+}
 
-    .federation {
+.federation {
     height: 48rpx;
     border-radius: 10rpx;
     padding: 28rpx 30rpx;
     margin: 30rpx;
     font-size: 32rpx;
     font-weight: 400;
-        color: #6F5931;
+    color: #6f5931;
     display: flex;
     justify-content: space-between;
     align-items: center;
     background: url(../../static/img/my/mybanner.png) no-repeat;
     background-size: cover;
-    }
+}
 
-    .forMembership {
+.forMembership {
     width: 140rpx;
     height: 50rpx;
-        background: linear-gradient(112deg, #EFE0BC 0%, #D29A5A 100%, #DDBA88 100%);
+    background: linear-gradient(112deg, #efe0bc 0%, #d29a5a 100%, #ddba88 100%);
     box-shadow: 0px 0px 2px 1px rgba(231, 174, 85, 0.39);
     border-radius: 25rpx;
     font-size: 26rpx;
     font-weight: 400;
-        color: #6F5931;
+    color: #6f5931;
     line-height: 48rpx;
     text-align: center;
-    }
+}
 
-    .bottom {
+.bottom {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #999999;
@@ -235,22 +250,27 @@
     /* width: 100%; */
     margin: 120rpx 0;
     text-align: center;
-    }
+}
 
-    .btnList image:last-child {
+.btnList image:last-child {
     width: 19rpx;
     height: 32rpx;
     margin-left: auto;
     margin-right: 0;
-    }
+}
 
-    .btnList image {
+.imgswitch {
+    margin-left: auto;
+    margin-right: 0;
+}
+
+.btnList image {
     width: 52rpx;
     height: 52rpx;
     margin-right: 10rpx;
-    }
+}
 
-    .btnList {
+.btnList {
     font-family: PingFangSC-Regular;
     font-size: 32rpx;
     color: #333333;
@@ -258,16 +278,16 @@
     align-items: center;
     justify-content: flex-start;
     padding: 30rpx 20rpx;
-    }
+}
 
-    .btn {
+.btn {
     width: 690rpx;
     margin: 0 auto;
     border-radius: 15rpx;
     background: #fefefe;
-    }
+}
 
-    .BarList {
+.BarList {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -275,16 +295,16 @@
     width: 25%;
     text-align: center;
     padding: 30rpx 0rpx;
-    }
+}
 
-    .BarList image {
+.BarList image {
     width: 52rpx;
     height: 52rpx;
     display: block;
     margin: 0 auto;
-    }
+}
 
-    .centerBar {
+.centerBar {
     width: 690rpx;
     background-color: #fefefe;
     border-radius: 15rpx;
@@ -292,56 +312,56 @@
     position: absolute;
     bottom: -70rpx;
     left: 30rpx;
-    }
+}
 
-    .userContent {
+.userContent {
     font-family: PingFangSC-Regular;
     font-size: 26rpx;
-        color: #FFFFFF;
+    color: #ffffff;
     display: flex;
-    }
+}
 
-    .userTel {
+.userTel {
     font-family: PingFangSC-Medium;
     font-size: 36rpx;
-        color: #FFFFFF;
-    }
+    color: #ffffff;
+}
 
-    .userRight {
+.userRight {
     float: left;
     height: 50rpx;
     line-height: 50rpx;
-    }
+}
 
-    .userTitle image {
+.userTitle image {
     width: 100rpx;
     height: 100rpx;
     margin-right: 20rpx;
     float: left;
     border-radius: 200rpx;
-        background-color: rgba(255, 255, 255, .3);
-    }
+    background-color: rgba(255, 255, 255, 0.3);
+}
 
-    .userTitle {
+.userTitle {
     padding: 0 30rpx;
-    }
+}
 
-    .head {
-        background-color: #1B66FF;
+.head {
+    background-color: #1b66ff;
     width: 100%;
     height: 200rpx;
     padding-top: 200rpx;
     position: relative;
-    }
+}
 
-    .body {
+.body {
     background: #f6f6f6;
     height: 100%;
     position: relative;
     overflow: auto;
-    }
+}
 
-    /* .btn-out {
+/* .btn-out {
 		background-color: #fefefe;
 		margin-top: 20rpx;
 		padding: 20rpx 0;

pages/news/news.vue

@@ -27,7 +27,9 @@
     import {
         mapGetters
     } from 'vuex'
-
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     export default {
         data() {
             return {
@@ -36,14 +38,23 @@
         },
         onLoad() {},
         onShow() {
-            if (!this.$store.state.user.token) {
-                uni.redirectTo({
-                    url: "/pages/login/login"
+            if (/token/g.test(location.href)) {
+                this.$api.sleep(2000).then(() => {
+                    if (!this.$api.haslogin()) {
+                        GoLogin()
+						console.log('300')
+                    } else {
+                        uni.$emit('newsReadChange')
+						console.log('000')
+                    }
                 })
+            } else {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
                 } else {
                     uni.$emit('newsReadChange')
                 }
-            console.log(this.news)
+            }
         },
         onPullDownRefresh() {
             this.loading = true

pages/project/map.vue

@@ -92,24 +92,18 @@
         },
         mounted() {
             const _this = this
-            uni.getLocation({
-                type: 'gcj02',
-                success: function(res) {
+            console.log(this.$store.state.user.userLocation)
+            if (this.$store.state.user.userLocation) {
                 const {
-                        longitude,
-                        latitude
-                    } = res
-                    _this.latitude = latitude
-                    _this.longitude = longitude
+                    latitude,
+                    longitude
+                } = this.$store.state.user.userLocation
                 _this.getList(longitude, latitude).then((covers) => {
                     _this.$refs.uMap.addFeature(covers)
                 })
-                },
-                fail: function(err) {
+            } else {
                 _this.$api.msg('无法获得周边信息')
-                },
-                complete: function(e) {}
-            })
+            }
         },
         onShow() {
             // const _this = this
@@ -144,25 +138,17 @@
             },
             search() {
                 const _this = this
-                uni.getLocation({
-                    type: 'gcj02',
-                    success: function(res) {
+                if (this.$store.state.user.userLocation) {
                     const {
-                            longitude,
-                            latitude
-                        } = res
-                        _this.latitude = latitude
-                        _this.longitude = longitude
+                        latitude,
+                        longitude
+                    } = this.$store.state.user.userLocation
                     _this.getList(longitude, latitude).then((covers) => {
-                            _this.$api.msg('成功获得周边信息')
                         _this.$refs.uMap.addFeature(covers)
                     })
-                    },
-                    fail: function(err) {
+                } else {
                     _this.$api.msg('无法获得周边信息')
-                    },
-                    complete: function(e) {}
-                })
+                }
                 // this.getList(this.longitude, this.latitude).then((covers) => {
                 //     this.$api.msg('成功获得周边信息')
                 //     console.log(covers)

pages/project/newProject.vue

@@ -31,7 +31,7 @@
             <block v-if="activeTab == 0">
                 <view v-if="newList.length > 0">
                     <block v-for="(item, index) in newList" :key="index">
-                        <companyList :companyitem="item"></companyList>
+                        <companyList :companyitem="item" :position="userLocation"></companyList>
                     </block>
                 </view>
                 <view v-else>
@@ -51,7 +51,7 @@
 
                 <view v-if="companyList.length > 0">
                     <block v-for="(item, index) in companyList" :key="item.id">
-                        <workList :companyitem="item" :near="activeTab === 0"></workList>
+                        <workList :companyitem="item" :position="userLocation" :near="activeTab === 0"></workList>
                     </block>
                 </view>
                 <view v-else>
@@ -109,7 +109,9 @@
         getcoder
     } from "@/api/map.js";
     import verticalMenu from '@/components/vertical-menu/vertical-menu.vue';
-
+    import {
+        mapGetters
+    } from 'vuex'
     export default {
         components: {
             vTabs,
@@ -117,15 +119,16 @@
             verticalMenu,
             workList
         },
-
+        computed: {
+            ...mapGetters(['userLocation']),
+        },
         data() {
             return {
                 policyContentList: [],
-                activeTab: 0,
+                activeTab: '0',
                 companyList: [],
                 recommendList: [],
                 newList: [],
-
                 nearPage: {
                     current: 1,
                     size: 10,
@@ -142,10 +145,7 @@
                     total: 0
                 },
                 currentAddress: '',
-                currentPoint: {
-                    latitude: 0,
-                    longitude: 0
-                },
+
                 key: 'FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI',
                 open: false,
                 showPopUp: false,
@@ -157,10 +157,11 @@
             if (option.tabIndex) {
                 this.activeTab = option.tabIndex
             }
-            this.getData()
-            this.getPolicy()
+            this.$store.dispatch('getUserLocation')
+            this.download()
         },
         onShow: function() {
+
             const enumTitle = {
                 "0": '最新零工岗位',
                 "1": '最新全职岗位',
@@ -169,7 +170,7 @@
             uni.setNavigationBarTitle({
                 title: enumTitle[this.activeTab]
             })
-            if (this.$store.state.user.token) {
+            if (this.$api.haslogin()) {
                 this.$store.dispatch('refreshAuthState').then((e) => {
                     var auth = this.$store.state.auth
                     if (!auth.bankCardState) {
@@ -177,7 +178,6 @@
                     }
                 })
             }
-
             const value = uni.getStorageSync('active');
             if (value) {
                 this.activeTab = value;
@@ -190,13 +190,7 @@
         },
         /*下拉刷新*/
         onPullDownRefresh: function() {
-            if (!this.$store.state.user.token) {
-                uni.redirectTo({
-                    url: "/pages/login/login"
-                });
-            } else {
             this.download();
-            }
         },
         methods: {
             step() {
@@ -228,30 +222,6 @@
                     url: '/pageMy/my/resume/addSkill'
                 })
             },
-            /*定位*/
-            getLocation: function() {
-                var that = this;
-                uni.getLocation({
-                    type: 'gcj02',
-                    success: function(res) {
-                        that.currentPoint = {
-                            latitude: res.latitude,
-                            longitude: res.longitude
-                        }
-                        // that.getAddrByPoint(res);
-                        that.getNearList(that.currentPoint)
-                    },
-                    complete: function(e) {}
-                });
-            },
-            /*逆地址解析*/
-            getAddrByPoint: function(point) {
-                var that = this;
-                var location = point.latitude + ',' + point.longitude
-                getcoder(location, encodeURI(that.key), 0).then(res => {
-                    that.currentAddress = res.data.result.address
-                });
-            },
             goSeach: function() {
                 uni.navigateTo({
                     url: '../seach/seach'
@@ -271,8 +241,8 @@
                 this.activeTab = e;
             },
             //附近任务；
-            getNearList: function(point) {
-                nearMission(this.nearPage.current, this.nearPage.size).then(res => {
+            getNearList: function() {
+                nearMission(this.nearPage.current, this.nearPage.size, 1).then(res => {
                     if (this.nearPage.current === 1) {
                         this.companyList = [];
                     }
@@ -313,7 +283,7 @@
             },
             //最新任务；
             getNewList: function() {
-                newMissionAll(this.newPage.current, this.newPage.size, '').then(res => {
+                newMissionAll(this.newPage.current, this.newPage.size, '', 1).then(res => {
                     if (this.newPage.current === 1) {
                         this.newList = [];
                     }
@@ -326,32 +296,31 @@
             },
             //上拉加载
             upLoad: function() {
-                if (this.activeTab === 0) {
-                    if (this.nearPage.current <= Math.ceil(this.nearPage.total / this.nearPage.size)) {
-                        this.getNearList(this.currentPoint);
-                    } else {
-                        uni.showToast({
-                            icon: "none",
-                            title: '已经是最后一页',
-                        })
-                    }
-                    return
-                }
-                if (this.activeTab === 1) {
-                    if (this.recommendPage.current <= Math.ceil(this.recommendPage.total / this.recommendPage
-                            .size)) {
-                        this.getRecommendList();
-                    } else {
-                        uni.showToast({
-                            icon: "none",
-                            title: '已经是最后一页',
-                        })
-                    }
-                    return
-                }
-                if (this.activeTab === 2) {
+                if (this.activeTab === '0') {
                     if (this.newPage.current <= Math.ceil(this.newPage.total / this.newPage.size)) {
-                        this.getNewList();
+                        this.getNewList()
+                    } else {
+                        uni.showToast({
+                            icon: "none",
+                            title: '已经是最后一页',
+                        })
+                    }
+                    return
+                }
+                if (this.activeTab === '1') {
+                    if (this.nearPage.current <= Math.ceil(this.nearPage.total / this.nearPage.size)) {
+                        this.getNearList();
+                    } else {
+                        uni.showToast({
+                            icon: "none",
+                            title: '已经是最后一页',
+                        })
+                    }
+                    return
+                }
+                if (this.activeTab === '2') {
+                    if (this.newPage.current <= Math.ceil(this.newPage.total / this.newPage.size)) {
+                        this.getPolicy();
                     } else {
                         uni.showToast({
                             icon: "none",
@@ -365,25 +334,24 @@
             download: function() {
                 console.log(this.activeTab)
                 if (this.activeTab === '0') {
-                    this.nearPage.current = 1;
-                    console.log('123123')
-                    this.getLocation();
+                    this.newPage.current = 1;
+                    this.getNewList();
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
                     }, 1000);
                     return
                 }
                 if (this.activeTab === '1') {
-                    this.recommendPage.current = 1;
-                    this.getRecommendList();
+                    this.nearPage.current = 1;
+                    this.getNearList();
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
                     }, 1000);
                     return
                 }
                 if (this.activeTab === '2') {
-                    this.newPage.current = 1;
-                    this.getNewList();
+                    // this.newPage.current = 1;
+                    this.getPolicy();
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
                     }, 1000);
@@ -391,20 +359,13 @@
                 }
             },
             getData: function() {
-                if (!this.$store.state.user.token) {
-                    uni.redirectTo({
-                        url: "/pages/login/login"
-                    });
-                } else {
                 uni.$emit('newsReadChange');
                 this.nearPage.current = 1;
                 this.recommendPage.current = 1;
                 this.newPage.current = 1;
-                    this.getLocation();
                 this.getRecommendList();
                 this.getNewList();
                 this.getNearList();
-                }
             },
 
 
@@ -442,7 +403,8 @@
     .content {
         background-color: #f3f4f8;
         padding-top: 20rpx;
-        min-height: 80vh;
+        /* min-height: 80vh; */
+        min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     }
 
 

pages/project/project copy.vue

@@ -181,7 +181,7 @@
             this.getPolicy()
         },
         onShow: function() {
-            if (this.$store.state.user.token) {
+            if (this.$api.haslogin()) {
                 this.$store.dispatch('refreshAuthState').then((e) => {
                     var auth = this.$store.state.auth
                     if (!auth.bankCardState) {
@@ -202,7 +202,7 @@
         },
         /*下拉刷新*/
         onPullDownRefresh: function() {
-            if (!this.$store.state.user.token) {
+            if (!this.$api.haslogin()) {
                 uni.redirectTo({
                     url: "/pages/login/login"
                 });
@@ -244,7 +244,7 @@
             getLocation: function() {
                 var that = this;
                 uni.getLocation({
-                    type: 'gcj02',
+                    type: 'wgs84',
                     success: function(res) {
                         that.currentPoint = {
                             latitude: res.latitude,
@@ -455,7 +455,7 @@
                 }
             },
             getData: function() {
-                if (!this.$store.state.user.token) {
+                if (!this.$api.haslogin()) {
                     uni.redirectTo({
                         url: "/pages/login/login"
                     });
@@ -610,7 +610,8 @@
     .content {
         background-color: #f3f4f8;
         padding-top: 20rpx;
-        min-height: 80vh;
+        /* min-height: 80vh; */
+        min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     }
 
 

pages/project/project.vue

@@ -7,18 +7,21 @@
         </view>
         <view class="navPosition" @click="navTo('/pages/project/map')">
             <u-icon name="map" color="#2979ff" size="16"></u-icon>
-            <view class="positionText">德阳市地图服务</view>
+            <view class="positionText">石河子地图服务</view>
             <u-icon name="arrow-right" color="#666666" size="14"></u-icon>
         </view>
         <view class="content">
             <view class="typeButtonWrapper">
-                <view class="typeButtonLeft">
-
+                <scroll-view class="typeButtonLeft" scroll-x="true" scroll-left="0">
                     <view v-for="(item, index) in nonReactiveArray" :key="index"
-                        :class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{
-				item
-			}}</view>
+                        :class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">
+                        {{item}}
                     </view>
+                </scroll-view>
+                <!--  <view class="typeButtonLeft">
+                    <view v-for="(item, index) in nonReactiveArray" :key="index"
+                        :class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{item}}</view>
+                </view> -->
                 <!-- 筛选 -->
                 <view class="screenButton" @click="showPopUp = true">
                     筛选
@@ -55,7 +58,7 @@
 
                 <view v-if="companyList.length > 0" style="padding-bottom: 20rpx;">
                     <block v-for="(item, index) in companyList" :key="item.id">
-                        <workList :companyitem="item" :near="activeTab === 0"></workList>
+                        <workList :companyitem="item" :position="userLocation" :near="activeTab === 0"></workList>
                     </block>
                 </view>
                 <view v-else>
@@ -103,6 +106,9 @@
     import companyList from '@/components/companyList/companyList.vue';
     import workList from '@/components/companyList/workList.vue'
     import userrecruitList from './userrecruitList.vue'
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     import {
         newMissionAll,
         recommendMission,
@@ -164,41 +170,25 @@
                     total: 0
                 },
                 currentAddress: '',
-                currentPoint: {
-                    latitude: 0,
-                    longitude: 0
-                },
                 key: 'FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI',
                 open: false,
                 showPopUp: false,
                 isSearch: false,
                 searchData: {},
-
                 // nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"],
                 nonReactiveArray: ["推荐零工岗位", "推荐全职岗位", "全部零工岗位", "全部全职岗位"],
             }
         },
         onLoad: function() {
-            this.getData()
-            console.log('userLocation', this.userLocation)
-            // this.getPolicy()
+            this.$store.dispatch('getUserLocation')
         },
         onShow: function() {
-            this.download();
-
-            if (this.$store.state.user.token) {
-                this.$store.dispatch('refreshAuthState').then((e) => {
-                    var auth = this.$store.state.auth
-                    if (!auth.bankCardState) {
-                        this.step()
-                    }
+            if (/token/g.test(location.href)) {
+                this.$api.sleep(2000).then(() => {
+                    this.showInit()
                 })
-            }
-
-            const value = uni.getStorageSync('active');
-            if (value) {
-                this.activeTab = value;
-                uni.removeStorageSync('active')
+            } else {
+                this.showInit()
             }
         },
         /*页面滚动到底部 换页*/
@@ -207,7 +197,7 @@
         },
         /*下拉刷新*/
         onPullDownRefresh: function() {
-            if (!this.$store.state.user.token) {
+            if (!this.$api.haslogin()) {
                 uni.redirectTo({
                     url: "/pages/login/login"
                 });
@@ -216,6 +206,27 @@
             }
         },
         methods: {
+            showInit() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+                this.getData()
+                this.download();
+                if (this.$api.haslogin()) {
+                    this.$store.dispatch('refreshAuthState').then((e) => {
+                        var auth = this.$store.state.auth
+                        if (!auth.bankCardState) {
+                            this.step()
+                        }
+                    })
+                }
+                const value = uni.getStorageSync('active');
+                if (value) {
+                    this.activeTab = value;
+                    uni.removeStorageSync('active')
+                }
+            },
             step() {
                 var that = this
                 that.open = true
@@ -245,23 +256,6 @@
                     url: '/pageMy/my/resume/addSkill'
                 })
             },
-            /*定位*/
-            getLocation: function() {
-                var that = this;
-                uni.getLocation({
-                    type: 'gcj02',
-                    success: function(res) {
-                        that.currentPoint = {
-                            latitude: res.latitude,
-                            longitude: res.longitude
-                        }
-                        console.log('打印', res)
-                        // that.getAddrByPoint(res);
-                        that.getNearList(that.currentPoint)
-                    },
-                    complete: function(e) {}
-                });
-            },
             /*逆地址解析*/
             getAddrByPoint: function(point) {
                 var that = this;
@@ -419,10 +413,10 @@
             //下拉刷新
             download: function() {
                 this.isSearch = false;
+                this.$store.dispatch('getUserLocation')
                 if (this.activeTab === 0 || this.activeTab === 2) {
                     this.nearPage.current = 1;
                     this.newPage.current = 1;
-                    this.getLocation();
                     this.getNewList()
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
@@ -430,7 +424,8 @@
                     return
                 }
                 if (this.activeTab === 1 || this.activeTab === 3) {
-                    this.nearPage.current === 1
+                    this.nearPage.current = 1;
+                    this.newPage.current = 1;
                     this.getNearList()
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
@@ -447,20 +442,19 @@
                 // }
             },
             getData: function() {
-                if (!this.$store.state.user.token) {
-                    uni.redirectTo({
-                        url: "/pages/login/login"
-                    });
-                } else {
+                // if (!this.$api.haslogin()) {
+                //     uni.redirectTo({
+                //         url: "/pages/login/login"
+                //     });
+                // } else {
                 uni.$emit('newsReadChange');
                 this.nearPage.current = 1;
                 this.policyPage.current = 1;
                 this.newPage.current = 1;
-                    this.getLocation();
                 // this.getNewList();
                 // this.getNearList();
                 // this.getPolicy()
-                }
+                // }
             },
             closePopUp() {
                 this.showPopUp = false
@@ -630,8 +624,8 @@
 
     .content {
         background-color: #f3f4f8;
-        padding-top: 20rpx;
-        min-height: 80vh;
+        /* min-height: 80vh; */
+        min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     }
 
 
@@ -647,6 +641,7 @@
         line-height: 30px;
         font-size: 14px;
         background-color: #fff;
+        margin: 20rpx 0;
     }
 
     .typeButtonWrapper {
@@ -658,9 +653,8 @@
     }
 
     .typeButtonLeft {
-        display: flex;
         width: 80%;
-        overflow-x: scroll;
+        white-space: nowrap;
     }
 
     .typeButton {
@@ -670,6 +664,8 @@
         border-radius: 50px;
         margin-right: 10rpx;
         white-space: nowrap;
+        margin: 20rpx 10rpx 20rpx 0;
+        display: inline-block;
     }
 
     .activeButton {

pages/projectInfo/projectInfo.vue

@@ -2,72 +2,63 @@
     <view v-if="showDetail">
         <view class="head">
             <view class="proname">
-                {{info.missionTitle || '暂无'}}
+                {{ info.missionTitle || '暂无' }}
             </view>
             <!-- <view class="prolist">
 				任务编码：{{info.missionNo}}
 			</view> -->
             <view class="prolist">
                 <!-- 开始时间：{{dateFormat((info.stime))}}至{{dateFormat((info.etime))}} -->
-                开始时间：{{dateFormat((info.stime)) || '暂无'}}
+                开始时间：{{ dateFormat(info.stime) || '暂无' }}
             </view>
             <!-- <view class="prolist">
 				报名截止：{{dateFormat((info.etimePub))}}
 			</view> -->
-            <view class="prolist">
-                招聘人数：{{info.peopleNum || '暂无'}}
-            </view>
-            <view class="prolist">
-                行业类型：{{info.tradeNames || '暂无'}}
-            </view>
-            <view class="prolist">
-                零工工种：{{info.worktypeNames || '暂无'}}
-            </view>
-            <!-- <view class="fee">
-                {{info.wage || '暂无'}}
+            <view class="prolist">招聘人数：{{ info.peopleNum || '暂无' }}</view>
+            <view class="prolist">行业类型：{{ info.tradeNames || '暂无' }}</view>
+            <view class="prolist">零工工种：{{ info.worktypeNames || '暂无' }}</view>
+            <!-- <view class="prolist">
+				参考工资：
+				{{info.wageUnitCategory === 4 ? wageUnitdata[info.wage] : (info.wage || '暂无') }}
+				{{info.wageUnitCategory === 4 ? '' :wageUnit[info.wageUnitCategory]}}
             </view> -->
+			<view class="prolist">
+				参考工资：
+				{{info.wage}}
+			</view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                岗位要求
+            <view class="proname proneed">岗位要求</view>
+            <view class="prolist">
+                <view class="protype">年龄要求：{{ age[info.ageDesc] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    年龄要求：{{age[info.ageDesc] || '暂无'}}
-                </view>
+                <view class="protype">学历要求：{{ education[info.education] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{education[info.education] || '暂无'}}
-                </view>
-            </view>
-            <view class="prolist">
-                <view class="protype">
-                    经验要求：{{experience[info.experienceDesc] || '暂无'}}
-                </view>
-            </view>
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                岗位描述
+                <view class="protype">经验要求：{{ experience[info.experienceDesc] || '暂无' }}</view>
             </view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">岗位描述</view>
             <view class="prolist description">
-                {{info.missionDesc || '暂无'}}
+                {{ info.missionDesc || '暂无' }}
             </view>
             <!-- 技能标签 start -->
             <view class="ask">
-                <view class="askList" v-for="(item,index) in skillNames" :key="index">
-                    {{item}}
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
                 </view>
             </view>
             <!-- 技能标签 end -->
-            <view v-if="info.jobSources" class="prolist">
-                来源：{{info.jobSources || '暂无'}}
-            </view>
+            <view v-if="info.jobSources" class="prolist">来源：{{ info.jobSources || '暂无' }}</view>
         </view>
         <view class="head">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
-                </image>
-                <view style="font-size: 30rpx;">{{info.missionCompanyName || '暂无'}}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.missionCompanyName || '暂无' }}</view>
             </view>
             <!-- <view class="proname proneed">
                 企业信息
@@ -77,9 +68,7 @@
             </view> -->
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
@@ -94,77 +83,116 @@
             <!--           <view class="prolist">
                 用工单位地址：{{info.companyAddress || '暂无'}}
             </view> -->
-            <view class="prolist">
-                注册地址：{{info.cityId || '暂无'}}
-            </view>
-            <view class="prolist">
-                工作地址：{{info.address || '暂无'}}
-            </view>
+            <view class="prolist">注册地址：{{ info.cityId || '暂无' }}</view>
+            <view class="prolist">工作地址：{{ info.address || '暂无' }}</view>
             <view class="map">
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" :MapUrl="$config.supperMap" :init="false"
-                    :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    :MapUrl="$config.supperMap"
+                    :init="false"
+                    :flag-tip="false"
+                ></super-map>
             </view>
             <!-- <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map> -->
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
-        <view class="btn" v-if="isShow!=='0'&&status===0">
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
+        <view class="btn" v-if="isShow !== '0' && status === 0">
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
-                申请
+            <view @click="submit" class="bottombtn flexbtn">申请</view>
         </view>
-        </view>
-        <view class="btn" v-if="isShow!=='0'&&status!==0">
+        <view class="btn" v-if="isShow !== '0' && status !== 0">
             <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx">已申请</view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="height: 200rpx;padding: 20rpx 40rpx;">
-                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
-                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
-                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
-                    <span style="color: blue"
-                        @click="tools.onDialingPhoneNumber(info.callTel)">{{ info.callTel }}</span>
+            <view style="height: 200rpx; padding: 20rpx 40rpx">
+                <view style="font-size: 28rpx; font-weight: bold">重要提示：</view>
+                <view style="font-size: 24rpx; color: #707070; margin-top: 10rpx">
+                    为保障个人基本劳动权益，建议通过平台用工的形式就业
+                </view>
+                <view style="text-align: center; font-size: 28rpx; margin-top: 30rpx">
+                    {{ info.callName || '联系人' }} :
+                    <span style="color: blue" v-if="info.callTel" @click="tools.onDialingPhoneNumber(info.callTel)">
+                        {{ info.callTel }}
+                    </span>
+                    <span style="color: #333333" v-else>无联系方式</span>
                 </view>
             </view>
         </u-popup>
@@ -172,7 +200,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -182,47 +210,28 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        missionDetail,
-        missionDetailById,
-        submit,
-        getCollectState,
-        updateCollectStatus
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../untils/format.js";
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import uniPopup from '@/components/uni-popup/uni-popup.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    import {
-        AddressToLocation
-    } from '@/untils/addressToLocation.js'
-    import {
-        add
-    } from 'lodash';
-    export default {
+import { mapGetters } from 'vuex';
+import { missionDetail, missionDetailById, submit, getCollectState, updateCollectStatus } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+ import dic from '@/common/dic.js'
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../untils/format.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+import { AddressToLocation } from '@/untils/addressToLocation.js';
+import { add } from 'lodash';
+export default {
     data() {
         return {
             ...dictionary,
@@ -235,15 +244,18 @@
             loading: false,
             latitude: 31.126855, //中心点
             longitude: 104.397894,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 31.126855,
                     longitude: 104.397894,
                     // width:30,
                     // height:30,
-                    iconPath: '../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -251,15 +263,20 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-                isInvite: false
+            isInvite: false,
+			wageUnitdata: {
+				1:'计件',
+				2:'面议'
 			}
+        };
     },
     components: {
         uniMask,
         validCode,
-            uniPopup
+        uniPopup,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.missionNo) {
             this.missionNo = decodeURIComponent(option.missionNo);
@@ -274,32 +291,50 @@
             this.id = option.id; //消息id
         }
         if (option.isInvite) {
-                this.isInvite = true
+            this.isInvite = true;
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
 		
+		
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
         collect() {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             // console.log('收藏，取消收藏')
             const status = this.collectStatus == 0 ? 1 : 0;
-                updateCollectStatus(this.info.id, status, 0).then(res => {
+            updateCollectStatus(this.info.id, status, 0).then((res) => {
                 if (res.data.code == 200) {
-                        this.getCollectStatus()
+                    this.getCollectStatus();
                 }
-                })
+            });
         },
-            callPhone() {
+        async callPhone() {
+            getPhoneCountNumber();
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             this.showPopUp = true;
         },
         closePopUp() {
@@ -307,21 +342,22 @@
         },
         // 获取收藏状态
         getCollectStatus() {
-                getCollectState(this.info.id, 0).then(res => {
+            getCollectState(this.info.id, 0).then((res) => {
                 // 0 未收藏，1 已收藏
                 // console.log(res)
                 this.collectStatus = res.data.data;
-                })
+            });
         },
-            getData: function() {
+        getData: function () {
             const self = this;
-                let detail = null
+            let detail = null;
             if (this.isInvite) {
-                    detail = missionDetailById
+                detail = missionDetailById;
             } else {
-                    detail = missionDetail
+                detail = missionDetail;
             }
-                detail(self.missionNo).then(res => {
+            detail(self.missionNo).then(
+                (res) => {
                     self.info = res.data.data;
                     self.status = res.data.data.detailStatus;
                     // AddressToLocation({
@@ -341,37 +377,43 @@
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
-                        })
+                        });
                     }
-
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {
                         // 设置已读
-                        setRead(self.id).then(res => {
-                            self.$store.commit("SET_READ");
-                        })
-                    }
-                }, error => {
-                    console.log(error);
+                        setRead(self.id).then((res) => {
+                            self.$store.commit('SET_READ');
                         });
+                    }
                 },
-            submit: function() {
-                const _that = this
+                (error) => {
+                    console.log(error);
+                }
+            );
+        },
+        submit: function () {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
+
+            const _that = this;
             uni.showModal({
                 title: '提示',
                 content: '请确认申请，申请后不能撤销',
-                    success: function(res) {
+                success: function (res) {
                     if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
-                            if (_that.loading) return
-                            const auth = _that.auth
-                            const contractOn = _that.info.contractOn
-                            const sealOk = _that.autograph && _that.autograph.data && _that.autograph
-                                .data.signSrcUrl
+                        if (_that.loading) return;
+                        const auth = _that.auth;
+                        const contractOn = _that.info.contractOn;
+                        const sealOk = _that.autograph && _that.autograph.data && _that.autograph.data.signSrcUrl;
                         // if (sealOk) {
                         // 	console.log('直接抢任务')
                         // 	this.submitTask()
@@ -382,88 +424,109 @@
                         // 	this.goSign(1)
                         // } else
                         if (contractOn && !sealOk) {
-                                _that.goSign(2)
+                            _that.goSign(2);
                         } else if (sealOk && contractOn) {
-                                _that.nextBtn = true
-                                _that.lookMask()
+                            _that.nextBtn = true;
+                            _that.lookMask();
                         } else {
-                                _that.submitTask()
+                            _that.submitTask();
                         }
                     } else if (res.cancel) {
-                            _that.$api.msg('取消申请')
-                        }
+                        _that.$api.msg('取消申请');
                     }
+                },
             });
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 抢任务
         submitTask() {
-                submit(this.missionNo, 0).then(res => {
-                    uni.hideLoading()
+            submit(this.missionNo, 0).then(
+                (res) => {
+                    uni.hideLoading();
                     uni.showToast({
                         title: '操作成功',
-                        icon: 'none'
+                        icon: 'none',
                     });
                     this.status = null;
-                    this.loading = false
-                }, error => {
-                    this.loading = false
-                });
+                    this.loading = false;
+                },
+                (error) => {
+                    this.loading = false;
+                }
+            );
         },
         // 步骤
         goSign(active) {
             uni.navigateTo({
-                    url: `/pages/projectInfo/signContract?active=${active}`
-                })
+                url: `/pages/projectInfo/signContract?active=${active}`,
+            });
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
+		
+		// wageUnit(data) {
+		// 	  let rel = {};
+		// 	  data.forEach((element) => {
+		// 	    rel[element.value] = element.label;
+		// 	  });
+		// 	  // return rel;
+		// }
     },
     computed: {
         ...mapGetters(['auth', 'autograph', 'area']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
+                return this.info.skillNames.split(',');
             }
         },
+		wageUnit() {
+			const data = dic.wageUnitCategoryState[0]
+			  let rel = {};
+			  data.forEach((element) => {
+			    rel[element.value] = element.label;
+			  });
+			  return rel;
+		}
         // cityNamed() {
         //     if (this.info && typeof this.info.cityId !== 'undefined' && this.info.cityId !== -1 && this.area
         //         .dic) {
@@ -472,19 +535,19 @@
         //         return '无'
         //     }
         // }
-        }
-    }
+    },
+};
 </script>
 
 <style lang="scss">
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -518,15 +581,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -536,7 +598,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -552,34 +614,34 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
-        border-radius: 10rpx;
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+    border-radius: 45rpx;
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -588,19 +650,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -608,9 +670,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -618,31 +680,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -651,9 +711,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -661,16 +721,16 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 </style>

pages/projectInfo/userrecruitInfo.vue

@@ -2,75 +2,68 @@
     <view v-if="showDetail">
         <view class="head">
             <view class="proname">
-                {{info.jobName || '暂无'}}
+                {{ info.jobName || '暂无' }}
             </view>
             <!-- <view class="prolist">
 				任务编码：{{info.missionNo}}
 			</view> -->
             <view class="prolist">
                 <!-- 开始时间：{{dateFormat((info.stime))}}至{{dateFormat((info.etime))}} -->
-                开始时间：{{dateFormat((info.stime)) || '暂无'}}
+                开始时间：{{ dateFormat(info.stime) || '暂无' }}
             </view>
             <!-- <view class="prolist">
 				报名截止：{{dateFormat((info.etimePub))}}
 			</view> -->
-            <view class="prolist">
-                招聘人数：{{info.peopleNum || '暂无'}}
-            </view>
-            <view class="prolist">
-                行业类型：{{info.tradeNames || '暂无'}}
-            </view>
-            <view class="prolist">
-                零工工种：{{info.worktypeNames || '暂无'}}
-            </view>
+            <view class="prolist">招聘人数：{{ info.peopleNum || '暂无' }}</view>
+            <view class="prolist">行业类型：{{ info.tradeNames || '暂无' }}</view>
+            <view class="prolist">零工工种：{{ info.worktypeNames || '暂无' }}</view>
             <!-- <view class="fee">
 		        {{info.wage || '暂无'}}
 		    </view> -->
-            <view class="position_right" v-if="info.reviewState === 1"
-                @click="navTo(`/pages/projectInfo/sub/inviteList?jobType=${info.jobType}&id=${info.id}&createUserId=${info.createUserId}`)">
-                邀请用户</view>
+            <view
+                class="position_right"
+                v-if="info.reviewState === 1"
+                @click="
+                    navTo(
+                        `/pages/projectInfo/sub/inviteList?jobType=${info.jobType}&id=${info.id}&createUserId=${info.createUserId}`
+                    )
+                "
+            >
+                邀请用户
+            </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                岗位要求
+            <view class="proname proneed">岗位要求</view>
+            <view class="prolist">
+                <view class="protype">年龄要求：{{ age[info.ageDesc] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    年龄要求：{{age[info.ageDesc] || '暂无'}}
-                </view>
+                <view class="protype">学历要求：{{ education[info.education] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{education[info.education] || '暂无'}}
-                </view>
-            </view>
-            <view class="prolist">
-                <view class="protype">
-                    经验要求：{{experience[info.experienceDesc] || '暂无'}}
-                </view>
-            </view>
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                岗位描述
+                <view class="protype">经验要求：{{ experience[info.experienceDesc] || '暂无' }}</view>
             </view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">岗位描述</view>
             <view class="prolist description">
-                {{info.jobDescription || '暂无'}}
+                {{ info.jobDescription || '暂无' }}
             </view>
             <!-- 技能标签 start -->
             <view class="ask">
-                <view class="askList" v-for="(item,index) in skillNames" :key="index">
-                    {{item}}
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
                 </view>
             </view>
             <!-- 技能标签 end -->
-            <view v-if="info.jobSources" class="prolist">
-                来源：{{info.jobSources || '暂无'}}
-            </view>
+            <view v-if="info.jobSources" class="prolist">来源：{{ info.jobSources || '暂无' }}</view>
         </view>
         <view class="head">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
-                </image>
-                <view style="font-size: 30rpx;">{{info.jobCompanyName || '暂无'}}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.jobCompanyName || '暂无' }}</view>
             </view>
             <!-- <view class="proname proneed">
 		        企业信息
@@ -80,9 +73,7 @@
 		    </view> -->
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
@@ -97,78 +88,117 @@
             <!--           <view class="prolist">
 		        公司地址：{{info.companyAddress || '暂无'}}
 		    </view> -->
-            <view class="prolist">
-                注册地址：{{info.cityId || '暂无'}}
-            </view>
-            <view class="prolist">
-                工作地址：{{info.address || '暂无'}}
-            </view>
+            <view class="prolist">注册地址：{{ info.cityId || '暂无' }}</view>
+            <view class="prolist">工作地址：{{ info.address || '暂无' }}</view>
             <view class="map">
                 <!-- <seeLocation ref="cMap" :apikey="$config.apiKey"></seeLocation> -->
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" :MapUrl="$config.supperMap" :init="false"
-                    :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    :MapUrl="$config.supperMap"
+                    :init="false"
+                    :flag-tip="false"
+                ></super-map>
             </view>
             <!-- <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map> -->
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
-        <view class="btn" v-if="isShow!=='0'&&status===0">
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
+        <view class="btn" v-if="isShow !== '0' && status === 0">
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
-                申请
+            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx">申请</view>
         </view>
-        </view>
-        <view class="btn" v-if="!jobType && isShow!=='0' && status!==0">
+        <view class="btn" v-if="!jobType && isShow !== '0' && status !== 0">
             <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx">已申请</view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="height: 200rpx;padding: 20rpx 40rpx;">
-                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
-                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
-                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
-                    <span style="color: blue"
-                        @click="tools.onDialingPhoneNumber(info.callTel)">{{ info.callTel }}</span>
+            <view style="height: 200rpx; padding: 20rpx 40rpx">
+                <view style="font-size: 28rpx; font-weight: bold">重要提示：</view>
+                <view style="font-size: 24rpx; color: #707070; margin-top: 10rpx">
+                    为保障个人基本劳动权益，建议通过平台用工的形式就业
+                </view>
+                <view style="text-align: center; font-size: 28rpx; margin-top: 30rpx">
+                    {{ info.callName || '联系人' }} :
+                    <span style="color: blue" v-if="info.callTel" @click="tools.onDialingPhoneNumber(info.callTel)">
+                        {{ info.callTel }}
+                    </span>
+                    <span style="color: #333333" v-else>无联系方式</span>
                 </view>
             </view>
         </u-popup>
@@ -176,7 +206,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -186,47 +216,27 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        missionDetail,
-        submit,
-        getCollectState,
-        updateCollectStatus,
-        workDetail
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../untils/format.js";
-    import {
-        userrecruitDetail
-    } from '@/api/userrecruit.js'
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    import seeLocation from '@/components/sylj-selectLocation/seeLocation.vue';
-    import {
-        getuserrecruitDetailApp
-    } from '@/api/userrecruit.js'
-    export default {
+import { mapGetters } from 'vuex';
+import { missionDetail, submit, getCollectState, updateCollectStatus, workDetail } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../untils/format.js';
+import { userrecruitDetail } from '@/api/userrecruit.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+import seeLocation from '@/components/sylj-selectLocation/seeLocation.vue';
+import { getuserrecruitDetailApp } from '@/api/userrecruit.js';
+export default {
     data() {
         return {
             ...dictionary,
@@ -239,15 +249,18 @@
             loading: false,
             latitude: 30.70032, //中心点
             longitude: 104.05235,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 0,
                     longitude: 0,
                     // width:30,
                     // height:30,
-                    iconPath: '../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -255,15 +268,16 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-                jobType: null
-            }
+            jobType: null,
+        };
     },
     components: {
         uniMask,
         validCode,
-            seeLocation
+        seeLocation,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.workId) {
             this.workId = decodeURIComponent(option.workId);
@@ -278,32 +292,49 @@
             this.id = option.id; //消息id
         }
         if (option.jobType) {
-                this.jobType = option.jobType
+            this.jobType = option.jobType;
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
-
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
         collect() {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             // console.log('收藏，取消收藏')
             const status = this.collectStatus == 0 ? 1 : 0;
-                updateCollectStatus(this.info.id, status, 2).then(res => {
+            updateCollectStatus(this.info.id, status, 2).then((res) => {
                 if (res.data.code == 200) {
-                        this.getCollectStatus()
+                    this.getCollectStatus();
                 }
-                })
+            });
         },
-            callPhone() {
+        async callPhone() {
+            getPhoneCountNumber();
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             this.showPopUp = true;
         },
         closePopUp() {
@@ -311,22 +342,22 @@
         },
         // 获取收藏状态
         getCollectStatus() {
-                getCollectState(this.info.id, 2).then(res => {
+            getCollectState(this.info.id, 2).then((res) => {
                 // 0 未收藏，1 已收藏
                 // console.log(res)
                 this.collectStatus = res.data.data;
-                })
+            });
         },
         async getData() {
             const self = this;
-                let resData = null
+            let resData = null;
             if (this.jobType) {
                 resData = await getuserrecruitDetailApp({
                     id: this.id,
-                        jobType: this.jobType
-                    })
+                    jobType: this.jobType,
+                });
             } else {
-                    resData = await userrecruitDetail(self.workId)
+                resData = await userrecruitDetail(self.workId);
             }
             if (resData.data?.code === 200) {
                 self.info = resData.data.data;
@@ -340,7 +371,7 @@
                     self.$refs.uMap.initMap({
                         lat: self.info.lat,
                         lon: self.info.lon,
-                        })
+                    });
                 }
                 // this.$refs.cMap.open()
                 self.showDetail = true;
@@ -348,29 +379,33 @@
                     self.getCollectStatus();
                     if (self.type === 1) {
                         // 设置已读
-                            setRead(self.id).then(res => {
-                                self.$store.commit("SET_READ");
-                            })
+                        setRead(self.id).then((res) => {
+                            self.$store.commit('SET_READ');
+                        });
                     }
                 }
             }
         },
-            submit: function() {
-                const _that = this
+        submit: function () {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
+            const _that = this;
             uni.showModal({
                 title: '提示',
                 content: '请确认申请，申请后不能撤销',
-                    success: function(res) {
+                success: function (res) {
                     if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
-                            if (_that.loading) return
-                            const auth = _that.auth
-                            const contractOn = _that.info.contractOn
-                            const sealOk = _that.autograph && _that.autograph.data && _that.autograph
-                                .data.signSrcUrl
+                        if (_that.loading) return;
+                        const auth = _that.auth;
+                        const contractOn = _that.info.contractOn;
+                        const sealOk = _that.autograph && _that.autograph.data && _that.autograph.data.signSrcUrl;
                         // if (sealOk) {
                         // 	console.log('直接抢任务')
                         // 	this.submitTask()
@@ -381,86 +416,91 @@
                         // 	this.goSign(1)
                         // } else
                         if (contractOn && !sealOk) {
-                                _that.goSign(2)
+                            _that.goSign(2);
                         } else if (sealOk && contractOn) {
-                                _that.nextBtn = true
-                                _that.lookMask()
+                            _that.nextBtn = true;
+                            _that.lookMask();
                         } else {
-                                _that.submitTask()
+                            _that.submitTask();
                         }
                     } else if (res.cancel) {
-                            _that.$api.msg('取消申请')
-                        }
+                        _that.$api.msg('取消申请');
                     }
+                },
             });
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 岗位申请
         submitTask() {
-                submit(this.missionNo, 2).then(res => {
-                    uni.hideLoading()
+            submit(this.missionNo, 2).then(
+                (res) => {
+                    uni.hideLoading();
                     uni.showToast({
                         title: '操作成功',
-                        icon: 'none'
+                        icon: 'none',
                     });
                     this.status = null;
-                    this.loading = false
-                }, error => {
-                    this.loading = false
-                });
+                    this.loading = false;
+                },
+                (error) => {
+                    this.loading = false;
+                }
+            );
         },
         // 步骤
         goSign(active) {
             uni.navigateTo({
-                    url: `/pages/projectInfo/signContract?active=${active}`
-                })
+                url: `/pages/projectInfo/signContract?active=${active}`,
+            });
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
     },
     computed: {
         ...mapGetters(['auth', 'autograph', 'area']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
+                return this.info.skillNames.split(',');
             }
         },
         // cityNamed() {
@@ -472,21 +512,21 @@
         //         return '无'
         //     }
         // }
-        }
-    }
+    },
+};
 </script>
 
 <style lang="scss">
-    .head {
+.head {
     position: relative;
 
     .position_right {
         position: absolute;
         right: 24rpx;
         top: 30rpx;
-            color: #FFFFFF;
+        color: #ffffff;
         font-size: 24rpx;
-            background-color: #1B66FF;
+        background-color: #1b66ff;
         border-radius: 12rpx;
         padding: 10rpx 20rpx;
     }
@@ -495,16 +535,16 @@
         background-color: #e8e8e8;
         color: #333333;
     }
-    }
+}
 
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -538,15 +578,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -556,7 +595,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -572,24 +611,24 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
     border-radius: 10rpx;
@@ -597,9 +636,9 @@
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -608,19 +647,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -628,9 +667,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -638,31 +677,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -671,9 +708,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -681,16 +718,16 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 </style>

pages/projectInfo/userrecruitWorkInfo.vue

@@ -2,74 +2,64 @@
     <view v-if="showDetail">
         <view class="head">
             <view class="proname">
-                {{info.jobName || '暂无'}}
+                {{ info.jobName || '暂无' }}
             </view>
             <!-- <view class="prolist">
         		任务编码：{{info.missionNo}}
         	</view> -->
+            <view class="prolist">发布日期：{{ dateFormat(info.stime) || '暂无' }}</view>
+            <view class="prolist">招聘人数：{{ info.peopleNum || '暂无' }}</view>
             <view class="prolist">
-                发布日期：{{dateFormat((info.stime)) || '暂无'}}
-            </view>
-            <view class="prolist">
-                招聘人数：{{info.peopleNum || '暂无'}}
-            </view>
-            <view class="prolist">
-                行业类型：{{info.tradeNames?info.tradeNames:info.jobCompanyIndustry || '暂无'}}
-            </view>
-            <view class="prolist">
-                岗位工种：{{info.skillNames || '暂无'}}
+                行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry || '暂无' }}
             </view>
+            <view class="prolist">岗位工种：{{ info.skillNames || '暂无' }}</view>
             <!-- <view class="fee">
         		{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
         	</view> -->
-            <view class="position_right" v-if="info.reviewState === 1"
-                @click="navTo(`/pages/projectInfo/sub/inviteList?jobType=${info.jobType}&id=${info.id}&createUserId=${info.createUserId}`)">
-                邀请用户</view>
+            <view
+                class="position_right"
+                v-if="info.reviewState === 1"
+                @click="
+                    navTo(
+                        `/pages/projectInfo/sub/inviteList?jobType=${info.jobType}&id=${info.id}&createUserId=${info.createUserId}`
+                    )
+                "
+            >
+                邀请用户
+            </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                岗位要求
-            </view>
+            <view class="proname proneed">岗位要求</view>
             <!-- <view class="prolist">
         		<view class="protype">
         			年龄要求：{{age[info.ageDesc]}}
         		</view>
         	</view> -->
             <view class="prolist">
-                <view class="protype">
-                    年龄要求：{{age[info.ageDesc] || '暂无'}}
-                </view>
+                <view class="protype">年龄要求：{{ age[info.ageDesc] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{education[info.education] || '暂无'}}
-                </view>
+                <view class="protype">学历要求：{{ education[info.education] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    经验要求：{{info.experienceDesc || '暂无'}}
-                </view>
+                <view class="protype">经验要求：{{ info.experienceDesc || '暂无' }}</view>
             </view>
 
             <!--   <view class="prolist">
                 岗位地址：{{info.jobAddress}}
             </view> -->
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                岗位描述
-            </view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">岗位描述</view>
             <view class="prolist description">
-                {{info.jobDescription}}
+                {{ info.jobDescription }}
             </view>
             <!-- 技能标签 start -->
             <view class="ask">
-                <view class="askList" v-for="(item,index) in skillNames" :key="index">
-                    {{item}}
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
                 </view>
             </view>
             <!-- 技能标签 end -->
-            <view v-if="info.jobSources" class="prolist">
-                来源：{{info.jobSources || '暂无'}}
-            </view>
+            <view v-if="info.jobSources" class="prolist">来源：{{ info.jobSources || '暂无' }}</view>
         </view>
         <view class="head">
             <!-- <view class="proname proneed">
@@ -81,16 +71,17 @@
             <!-- <view class="prolist">
         		用工单位：{{info.jobCompanyName}}
         	</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
-                </image>
-                <view style="font-size: 30rpx;">{{info.jobCompanyName}}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.jobCompanyName }}</view>
             </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
         		<view class="protype">
         			联系人：{{info.callName}}
@@ -102,77 +93,117 @@
             <!-- <view class="prolist" v-if="info.callNumber">
         		座机号：{{info.callNumber}}
         	</view> -->
-            <view class="prolist">
-                注册地址：{{ info.cityId || '暂无'}}
-            </view>
-            <view class="prolist">
-                工作地址：{{info.address || '暂无'}}
-            </view>
+            <view class="prolist">注册地址：{{ info.cityId || '暂无' }}</view>
+            <view class="prolist">工作地址：{{ info.address || '暂无' }}</view>
             <view class="map">
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" @regionchange="show = false" :init="false"
-                    :MapUrl="$config.supperMap" :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    @regionchange="show = false"
+                    :init="false"
+                    :MapUrl="$config.supperMap"
+                    :flag-tip="false"
+                ></super-map>
             </view>
             <!-- <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map> -->
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
-        <view class="btn" v-if="isShow!=='0'&&status===0">
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
+        <view class="btn" v-if="isShow !== '0' && status === 0">
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
-                申请
+            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx">申请</view>
         </view>
-        </view>
-        <view class="btn" v-if="!jobType && isShow!=='0' && status!==0">
+        <view class="btn" v-if="!jobType && isShow !== '0' && status !== 0">
             <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx">已申请</view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="height: 200rpx;padding: 20rpx 40rpx;">
-                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
-                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
-                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
-                    <span style="color: blue"
-                        @click="tools.onDialingPhoneNumber(info.callTel)">{{ info.callTel }}</span>
+            <view style="height: 200rpx; padding: 20rpx 40rpx">
+                <view style="font-size: 28rpx; font-weight: bold">重要提示：</view>
+                <view style="font-size: 24rpx; color: #707070; margin-top: 10rpx">
+                    为保障个人基本劳动权益，建议通过平台用工的形式就业
+                </view>
+                <view style="text-align: center; font-size: 28rpx; margin-top: 30rpx">
+                    {{ info.callName || '联系人' }} :
+                    <span style="color: blue" v-if="info.callTel" @click="tools.onDialingPhoneNumber(info.callTel)">
+                        {{ info.callTel }}
+                    </span>
+                    <span style="color: #333333" v-else>无联系方式</span>
                 </view>
             </view>
         </u-popup>
@@ -180,7 +211,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -190,46 +221,26 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        missionDetail,
-        submit,
-        getCollectState,
-        updateCollectStatus,
-        workDetail
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../untils/format.js";
-    import {
-        userrecruitDetail
-    } from '@/api/userrecruit.js'
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    import {
-        getuserrecruitDetailApp
-    } from '@/api/userrecruit.js'
-    export default {
+import { mapGetters } from 'vuex';
+import { missionDetail, submit, getCollectState, updateCollectStatus, workDetail } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../untils/format.js';
+import { userrecruitDetail } from '@/api/userrecruit.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+import { getuserrecruitDetailApp } from '@/api/userrecruit.js';
+export default {
     data() {
         return {
             ...dictionary,
@@ -242,15 +253,18 @@
             loading: false,
             latitude: 31.126855, //中心点
             longitude: 104.397894,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 0,
                     longitude: 0,
                     // width:30,
                     // height:30,
-                    iconPath: '../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -258,14 +272,15 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-                jobType: null
-            }
+            jobType: null,
+        };
     },
     components: {
         uniMask,
-            validCode
+        validCode,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.workId) {
             this.workId = decodeURIComponent(option.workId);
@@ -280,32 +295,49 @@
             this.id = option.id; //消息id
         }
         if (option.jobType) {
-                this.jobType = option.jobType
+            this.jobType = option.jobType;
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
-
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
         collect() {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             // console.log('收藏，取消收藏')
             const status = this.collectStatus == 0 ? 1 : 0;
-                updateCollectStatus(this.info.id, status, 2).then(res => {
+            updateCollectStatus(this.info.id, status, 2).then((res) => {
                 if (res.data.code == 200) {
-                        this.getCollectStatus()
+                    this.getCollectStatus();
                 }
-                })
+            });
         },
-            callPhone() {
+        async callPhone() {
+            getPhoneCountNumber();
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             this.showPopUp = true;
         },
         closePopUp() {
@@ -313,22 +345,22 @@
         },
         // 获取收藏状态
         getCollectStatus() {
-                getCollectState(this.info.id, 2).then(res => {
+            getCollectState(this.info.id, 2).then((res) => {
                 // 0 未收藏，1 已收藏
                 // console.log(res)
                 this.collectStatus = res.data.data;
-                })
+            });
         },
         async getData() {
             const self = this;
-                let resData = null
+            let resData = null;
             if (this.jobType) {
                 resData = await getuserrecruitDetailApp({
                     id: this.id,
-                        jobType: this.jobType
-                    })
+                    jobType: this.jobType,
+                });
             } else {
-                    resData = await userrecruitDetail(self.workId)
+                resData = await userrecruitDetail(self.workId);
             }
             if (resData.data?.code === 200) {
                 self.info = resData.data.data;
@@ -342,36 +374,40 @@
                     self.$refs.uMap.initMap({
                         lat: self.info.lat,
                         lon: self.info.lon,
-                        })
+                    });
                 }
                 self.showDetail = true;
                 if (!this.seeDeatil) {
                     self.getCollectStatus();
                     if (self.type === 1) {
                         // 设置已读
-                            setRead(self.id).then(res => {
-                                self.$store.commit("SET_READ");
-                            })
+                        setRead(self.id).then((res) => {
+                            self.$store.commit('SET_READ');
+                        });
                     }
                 }
             }
         },
-            submit: function() {
-                const _that = this
+        submit: function () {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
+            const _that = this;
             uni.showModal({
                 title: '提示',
                 content: '请确认申请，申请后不能撤销',
-                    success: function(res) {
+                success: function (res) {
                     if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
-                            if (_that.loading) return
-                            const auth = _that.auth
-                            const contractOn = _that.info.contractOn
-                            const sealOk = _that.autograph && _that.autograph.data && _that.autograph
-                                .data.signSrcUrl
+                        if (_that.loading) return;
+                        const auth = _that.auth;
+                        const contractOn = _that.info.contractOn;
+                        const sealOk = _that.autograph && _that.autograph.data && _that.autograph.data.signSrcUrl;
                         // if (sealOk) {
                         // 	console.log('直接抢任务')
                         // 	this.submitTask()
@@ -382,86 +418,91 @@
                         // 	this.goSign(1)
                         // } else
                         if (contractOn && !sealOk) {
-                                _that.goSign(2)
+                            _that.goSign(2);
                         } else if (sealOk && contractOn) {
-                                _that.nextBtn = true
-                                _that.lookMask()
+                            _that.nextBtn = true;
+                            _that.lookMask();
                         } else {
-                                _that.submitTask()
+                            _that.submitTask();
                         }
                     } else if (res.cancel) {
-                            _that.$api.msg('取消申请')
-                        }
+                        _that.$api.msg('取消申请');
                     }
+                },
             });
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 岗位申请
         submitTask() {
-                submit(this.missionNo, 2).then(res => {
-                    uni.hideLoading()
+            submit(this.missionNo, 2).then(
+                (res) => {
+                    uni.hideLoading();
                     uni.showToast({
                         title: '操作成功',
-                        icon: 'none'
+                        icon: 'none',
                     });
                     this.status = null;
-                    this.loading = false
-                }, error => {
-                    this.loading = false
-                });
+                    this.loading = false;
+                },
+                (error) => {
+                    this.loading = false;
+                }
+            );
         },
         // 步骤
         goSign(active) {
             uni.navigateTo({
-                    url: `/pages/projectInfo/signContract?active=${active}`
-                })
+                url: `/pages/projectInfo/signContract?active=${active}`,
+            });
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
     },
     computed: {
         ...mapGetters(['auth', 'autograph', 'area']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
+                return this.info.skillNames.split(',');
             }
         },
         // cityNamed() {
@@ -472,19 +513,19 @@
         //         return '无'
         //     }
         // }
-        }
-    }
+    },
+};
 </script>
 
 <style lang="scss">
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -518,15 +559,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -536,7 +576,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -552,24 +592,24 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
     border-radius: 10rpx;
@@ -577,9 +617,9 @@
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -588,19 +628,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -608,9 +648,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -618,31 +658,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -651,9 +689,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -661,29 +699,29 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 
-    .head {
+.head {
     position: relative;
 
     .position_right {
         position: absolute;
         right: 24rpx;
         top: 30rpx;
-            color: #FFFFFF;
+        color: #ffffff;
         font-size: 24rpx;
-            background-color: #1B66FF;
+        background-color: #1b66ff;
         border-radius: 12rpx;
         padding: 10rpx 20rpx;
     }
@@ -692,5 +730,5 @@
         background-color: #e8e8e8;
         color: #333333;
     }
-    }
+}
 </style>

pages/projectInfo/workInfo.vue

@@ -2,71 +2,54 @@
     <view v-if="showDetail">
         <view class="head">
             <view class="proname">
-                {{info.jobName || '暂无'}}
+                {{ info.jobName || '暂无' }}
             </view>
             <!-- <view class="prolist">
 				任务编码：{{info.missionNo}}
 			</view> -->
+            <view class="prolist">发布日期：{{ dateFormat(info.stime) || '暂无' }}</view>
+            <view class="prolist">招聘人数：{{ info.peopleNum || '暂无' }}</view>
             <view class="prolist">
-                发布日期：{{dateFormat((info.stime)) || '暂无'}}
-            </view>
-            <view class="prolist">
-                招聘人数：{{info.peopleNum || '暂无'}}
-            </view>
-            <view class="prolist">
-                行业类型：{{info.tradeNames?info.tradeNames:info.jobCompanyIndustry || '暂无'}}
-            </view>
-            <view class="prolist">
-                岗位工种：{{info.skillNames || '暂无'}}
+                行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry || '暂无' }}
             </view>
+            <view class="prolist">岗位工种：{{ info.skillNames || '暂无' }}</view>
+            <view class="prolist">参考工资：{{info.wage}}～{{info.wageUpper}}{{wageUnit[info.wageUnitCategory]}}</view>
             <!-- <view class="fee">
 				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
 			</view> -->
         </view>
         <view class="head">
-            <view class="proname proneed">
-                岗位要求
-            </view>
+            <view class="proname proneed">岗位要求</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					年龄要求：{{age[info.ageDesc]}}
 				</view>
 			</view> -->
             <view class="prolist">
-                <view class="protype">
-                    年龄要求：{{age[info.ageDesc] || '暂无'}}
-                </view>
+                <view class="protype">年龄要求：{{ age[info.ageDesc] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{education[info.education] || '暂无'}}
-                </view>
+                <view class="protype">学历要求：{{ education[info.education] || '暂无' }}</view>
             </view>
             <view class="prolist">
-                <view class="protype">
-                    经验要求：{{info.experienceDesc || '暂无'}}
-                </view>
+                <view class="protype">经验要求：{{ info.experienceDesc || '暂无' }}</view>
             </view>
 
             <!--   <view class="prolist">
                 岗位地址：{{info.jobAddress}}
             </view> -->
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                岗位描述
-            </view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">岗位描述</view>
             <view class="prolist description">
-                {{info.jobDescription}}
+                {{ info.jobDescription }}
             </view>
             <!-- 技能标签 start -->
             <view class="ask">
-                <view class="askList" v-for="(item,index) in skillNames" :key="index">
-                    {{item}}
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
                 </view>
             </view>
             <!-- 技能标签 end -->
-            <view v-if="info.jobSources" class="prolist">
-                来源：{{info.jobSources || '暂无'}}
-            </view>
+            <view v-if="info.jobSources" class="prolist">来源：{{ info.jobSources || '暂无' }}</view>
         </view>
         <view class="head">
             <!-- <view class="proname proneed">
@@ -78,16 +61,17 @@
             <!-- <view class="prolist">
 				用工单位：{{info.jobCompanyName}}
 			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
-                </image>
-                <view style="font-size: 30rpx;">{{info.jobCompanyName}}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.jobCompanyName }}</view>
             </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
@@ -99,76 +83,116 @@
             <!-- <view class="prolist" v-if="info.callNumber">
 				座机号：{{info.callNumber}}
 			</view> -->
-            <view class="prolist">
-                注册地址：{{ info.cityId || '暂无'}}
-            </view>
-            <view class="prolist">
-                工作地址：{{info.address || '暂无'}}
-            </view>
+            <view class="prolist">注册地址：{{ info.cityId || '暂无' }}</view>
+            <view class="prolist">工作地址：{{ info.address || '暂无' }}</view>
             <view class="map">
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" @regionchange="show = false" :init="false"
-                    :MapUrl="$config.supperMap" :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    @regionchange="show = false"
+                    :init="false"
+                    :MapUrl="$config.supperMap"
+                    :flag-tip="false"
+                ></super-map>
             </view>
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
-        <view class="btn" v-if="isShow!=='0'&&status===0">
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
+        <view class="btn" v-if="isShow !== '0' && status === 0">
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
-                申请
+            <view @click="submit" class="bottombtn flexbtn">申请</view>
         </view>
-        </view>
-        <view class="btn" v-if="isShow!=='0'&&status!==0">
+        <view class="btn" v-if="isShow !== '0' && status !== 0">
             <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
-            <view @click="collect"
-                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
-                    mode=""></image>
-                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
-                    style="width: 36rpx;height: 36rpx;" mode=""></image>
-                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            <view
+                @click="collect"
+                style="display: flex; align-items: center; margin-right: 10rpx; flex-direction: column"
+            >
+                <image
+                    v-if="collectStatus == 0"
+                    src="../../static/img/collect.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <image
+                    v-if="collectStatus == 1"
+                    src="../../static/img/collect_yes.png"
+                    style="width: 36rpx; height: 36rpx"
+                    mode=""
+                ></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx; color: #707070; margin-top: 10rpx">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx; color: #707070; margin-top: 10rpx">
+                    已收藏
+                </view>
             </view>
 
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
-            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx">已申请</view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="height: 200rpx;padding: 20rpx 40rpx;">
-                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
-                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
-                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
-                    <span style="color: blue"
-                        @click="tools.onDialingPhoneNumber(info.callTel)">{{ info.callTel }}</span>
+            <view style="height: 200rpx; padding: 20rpx 40rpx">
+                <view style="font-size: 28rpx; font-weight: bold">重要提示：</view>
+                <view style="font-size: 24rpx; color: #707070; margin-top: 10rpx">
+                    为保障个人基本劳动权益，建议通过平台用工的形式就业
+                </view>
+                <view style="text-align: center; font-size: 28rpx; margin-top: 30rpx">
+                    {{ info.callName || '联系人  ' }} :
+                    <span style="color: blue" v-if="info.callNumber" @click="tools.onDialingPhoneNumber(info.callNumber)">
+                        {{ info.callNumber }}
+                    </span>
+                    <span style="color: #333333" v-else>无联系方式</span>
                 </view>
             </view>
         </u-popup>
@@ -176,7 +200,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -186,43 +210,25 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        missionDetail,
-        submit,
-        getCollectState,
-        updateCollectStatus,
-        workDetail
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../untils/format.js";
-    import {
-        userrecruitDetail
-    } from '@/api/userrecruit.js'
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    export default {
+import { mapGetters } from 'vuex';
+import { missionDetail, submit, getCollectState, updateCollectStatus, workDetail } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../untils/format.js';
+import { userrecruitDetail } from '@/api/userrecruit.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+export default {
     data() {
         return {
             ...dictionary,
@@ -235,15 +241,18 @@
             loading: false,
             latitude: 31.126855, //中心点
             longitude: 104.397894,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 0,
                     longitude: 0,
                     // width:30,
                     // height:30,
-                    iconPath: '../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -251,13 +260,14 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-            }
+        };
     },
     components: {
         uniMask,
-            validCode
+        validCode,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.workId) {
             this.workId = decodeURIComponent(option.workId);
@@ -272,31 +282,49 @@
             this.id = option.id; //消息id
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
         setTimeout(() => {
-                console.log(this.area.dic, this.info)
-            }, 1000)
+            console.log(this.area.dic, this.info);
+        }, 1000);
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
         collect() {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             // console.log('收藏，取消收藏')
             const status = this.collectStatus == 0 ? 1 : 0;
-                updateCollectStatus(this.info.id, status, 1).then(res => {
+            updateCollectStatus(this.info.id, status, 1).then((res) => {
                 if (res.data.code == 200) {
-                        this.getCollectStatus()
+                    this.getCollectStatus();
                 }
-                })
+            });
         },
-            callPhone() {
+        async callPhone() {
+            getPhoneCountNumber();
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
             this.showPopUp = true;
         },
         closePopUp() {
@@ -304,15 +332,17 @@
         },
         // 获取收藏状态
         getCollectStatus() {
-                getCollectState(this.info.id, 1).then(res => {
+            if (!this.$api.haslogin()) return;
+            getCollectState(this.info.id, 1).then((res) => {
                 // 0 未收藏，1 已收藏
                 // console.log(res)
                 this.collectStatus = res.data.data;
-                })
+            });
         },
-            getData: function() {
+        getData: function () {
             const self = this;
-                workDetail(self.workId).then(res => {
+            workDetail(self.workId).then(
+                (res) => {
                     self.info = res.data.data;
                     self.status = res.data.data.status;
                     self.missionNo = res.data.data.missionNo;
@@ -324,36 +354,42 @@
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
-                        })
+                        });
                     }
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {
                         // 设置已读
-                        setRead(self.id).then(res => {
-                            self.$store.commit("SET_READ");
-                        })
-                    }
-                }, error => {
-                    console.log(error);
+                        setRead(self.id).then((res) => {
+                            self.$store.commit('SET_READ');
                         });
+                    }
                 },
-            submit: function() {
-                const _that = this
+                (error) => {
+                    console.log(error);
+                }
+            );
+        },
+        submit: function () {
+            if (!this.$api.haslogin()) {
+                GoLogin();
+                return;
+            }
+
+            if (!this.$api.hasResume()) {
+                this.navTo('/pageMy/my/resume/index', true);
+                return;
+            }
+            const _that = this;
             uni.showModal({
                 title: '提示',
                 content: '请确认申请，申请后不能撤销',
-                    success: function(res) {
+                success: function (res) {
                     if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
-                            if (_that.loading) return
-                            const auth = _that.auth
-                            const contractOn = _that.info.contractOn
-                            const sealOk = _that.autograph && _that.autograph.data && _that.autograph
-                                .data.signSrcUrl
+                        if (_that.loading) return;
+                        const auth = _that.auth;
+                        const contractOn = _that.info.contractOn;
+                        const sealOk = _that.autograph && _that.autograph.data && _that.autograph.data.signSrcUrl;
                         // if (sealOk) {
                         // 	console.log('直接抢任务')
                         // 	this.submitTask()
@@ -364,86 +400,91 @@
                         // 	this.goSign(1)
                         // } else
                         if (contractOn && !sealOk) {
-                                _that.goSign(2)
+                            _that.goSign(2);
                         } else if (sealOk && contractOn) {
-                                _that.nextBtn = true
-                                _that.lookMask()
+                            _that.nextBtn = true;
+                            _that.lookMask();
                         } else {
-                                _that.submitTask()
+                            _that.submitTask();
                         }
                     } else if (res.cancel) {
-                            _that.$api.msg('取消申请')
-                        }
+                        _that.$api.msg('取消申请');
                     }
+                },
             });
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 岗位申请
         submitTask() {
-                submit(this.missionNo, 1).then(res => {
-                    uni.hideLoading()
+            submit(this.missionNo, 1).then(
+                (res) => {
+                    uni.hideLoading();
                     uni.showToast({
                         title: '操作成功',
-                        icon: 'none'
+                        icon: 'none',
                     });
                     this.status = null;
-                    this.loading = false
-                }, error => {
-                    this.loading = false
-                });
+                    this.loading = false;
+                },
+                (error) => {
+                    this.loading = false;
+                }
+            );
         },
         // 步骤
         goSign(active) {
             uni.navigateTo({
-                    url: `/pages/projectInfo/signContract?active=${active}`
-                })
+                url: `/pages/projectInfo/signContract?active=${active}`,
+            });
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
     },
     computed: {
         ...mapGetters(['auth', 'autograph', 'area']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
+                return this.info.skillNames.split(',');
             }
         },
         // cityNamed() {
@@ -454,19 +495,19 @@
         //         return '无'
         //     }
         // }
-        }
-    }
+    },
+};
 </script>
 
 <style lang="scss">
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -500,15 +541,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -518,7 +558,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -534,34 +574,34 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
-        border-radius: 10rpx;
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+    border-radius: 45rpx;
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -570,19 +610,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -590,9 +630,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -600,31 +640,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -633,9 +671,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -643,16 +681,16 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 </style>

pages/recruit/recruit.vue

@@ -31,11 +31,15 @@
         },
         computed: {
             ...mapState({
-                idNumber: (state) => state.auth.authInfo.idNumber
+                idNumber: (state) => {
+					console.log(state.auth.authInfo, 'auth.authInfo')
+					return state.auth.authInfo.idNumber
+				}
             }),
         },
         methods: {
             next(type) {
+				// return this.$api.msg('该功能正在完善中')
                 switch (type) {
                     case 0:
                         this.isHaveCode(this.idNumber).then(() => {
@@ -64,6 +68,9 @@
                         if (resData.data.data.haveCode) {
                             resolve()
                         } else {
+							
+							return this.$api.msg('系统正在建设中')
+							
                             switch (resData.data.data.reviewStatus) {
                                 case 0:
                                     this.$api.msg('您提交的认证信息正在审核中')

pages/recruit/subPage/MessageList.vue

@@ -26,11 +26,14 @@
 </template>
 
 <script>
-import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
-import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
+    import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
+    import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
 
-export default {
-	components: { CustomTabbar, CustomNavbar },
+    export default {
+        components: {
+            CustomTabbar,
+            CustomNavbar
+        },
         data() {
             return {
                 loading: false,
@@ -160,9 +163,9 @@ export default {
                 ]
             }
         },
-	onLoad() { },
+        onLoad() {},
         onShow() {
-		if (!this.$store.state.user.token) {
+            if (!this.$api.haslogin()) {
                 uni.redirectTo({
                     url: "/pages/login/login"
                 })
@@ -212,14 +215,16 @@ export default {
                 }
             },
             back() {
-			uni.reLaunch({ url: '/pages/my/my' })
+                uni.reLaunch({
+                    url: '/pages/my/my'
+                })
             },
         },
-}
+    }
 </script>
 
 <style>
-.content {
+    .content {
         font-family: PingFangSC-Regular;
         font-size: 28rpx;
         color: #666666;
@@ -229,49 +234,49 @@ export default {
         /*不换行*/
         text-overflow: ellipsis;
         /*超出部分文字以...显示*/
-}
+    }
 
-.head_right {
+    .head_right {
         float: right;
         font-family: PingFangSC-Regular;
         font-size: 24rpx;
         color: #CCCCCC;
-}
+    }
 
-.head_left {
+    .head_left {
         float: left;
         font-family: PingFangSC-Regular;
         font-size: 36rpx;
         color: #333333;
-}
+    }
 
-.head {
+    .head {
         overflow: hidden;
         width: 560rpx;
-}
+    }
 
-.newsListRight {
+    .newsListRight {
         float: left;
         width: 560rpx;
         height: 50rpx;
         line-height: 50rpx;
         padding-left: 30rpx;
-}
+    }
 
-.newsList .newsIcon {
+    .newsList .newsIcon {
         position: relative;
         width: 100rpx;
         height: 100rpx;
         display: inline-block;
         float: left;
-}
+    }
 
-.newsList image {
+    .newsList image {
         width: 100rpx;
         height: 100rpx;
-}
+    }
 
-.newsList .point {
+    .newsList .point {
         position: absolute;
         top: 5rpx;
         right: 10rpx;
@@ -279,9 +284,9 @@ export default {
         height: 20rpx;
         background: red;
         border-radius: 50%;
-}
+    }
 
-.newsList {
+    .newsList {
         border-bottom: 1rpx solid #dddddd;
         padding-bottom: 30rpx;
         padding-right: 30rpx;
@@ -290,18 +295,18 @@ export default {
         overflow: hidden;
         display: flex;
         align-items: center;
-}
+    }
 
-.body {
+    .body {
         background-color: #fefefe;
         /* padding-left: 30rpx;
 
 		width: 720rpx; */
-}
+    }
 
-page {
+    page {
         background: #f6f6f6;
-}
+    }
 </style>
 
 

pages/recruit/subPage/index.vue

@@ -10,7 +10,7 @@
         <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' : '']" @click="changeTab(item)">
+                    :class="['cond_item', item.id === currentArrTitleID ? 'activeButton' : '']" @click="changeTab(item)">
                     {{ item.text }}
                 </view>
             </view>
@@ -39,10 +39,12 @@
     } from '@/api/userrecruit.js'
     import userrecruitList from '../components/userrecruitList.vue'
     let arrGuide = ['在线填写招工需求', '后台审核沟通发布', '平台展示招工信息'];
-    let arrTitle = [{
-            text: "发布零工岗位",
-            id: 0
-        }, {
+    let arrTitle = [
+		// {
+  //           text: "发布零工岗位",
+  //           id: 0
+  //       }, 
+		{
             text: "发布全职岗位",
             id: 1
         }
@@ -76,7 +78,7 @@
                 reviewStatus,
                 pickerColumns,
                 openPicker: false,
-                currentArrTitleID: 2,
+                currentArrTitleID: 1,
                 currentReviewStatusID: '-1',
                 pageNumber: 1,
                 dataSource: [],
@@ -87,7 +89,7 @@
         }) {
             if (this.enterprise) {
                 this.pageType = 'enterprise'
-                this.currentArrTitleID = 0
+                this.currentArrTitleID = 1
             }
             this.getList('refresh')
         },

pages/recruit/subPage/newsDetail/userrecruitInfo.vue

@@ -7,45 +7,27 @@
             <!-- <view class="prolist">
 				任务编码：{{info.missionNo}}
 			</view> -->
-            <view class="prolist">
-                发布日期：{{ info.stime ? dateFormat((info.stime)) : null }}
-            </view>
-            <view class="prolist">
-                招聘人数：{{ info.peopleNum }}
-            </view>
-            <view class="prolist">
-                行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry }}
-            </view>
-            <view class="prolist">
-                工种类型：{{ info.skillNames }}
-            </view>
+            <view class="prolist">发布日期：{{ info.stime ? dateFormat(info.stime) : null }}</view>
+            <view class="prolist">招聘人数：{{ info.peopleNum }}</view>
+            <view class="prolist">行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry }}</view>
+            <view class="prolist">工种类型：{{ info.skillNames }}</view>
             <!-- <view class="fee">
 				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
 			</view> -->
         </view>
         <view class="head">
-            <view class="proname proneed">
-                招工要求
-            </view>
+            <view class="proname proneed">招工要求</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					年龄要求：{{age[info.ageDesc]}}
 				</view>
 			</view> -->
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{ info.education }}
-                </view>
-                <view class="protype">
-                    经验要求：{{ info.experienceDesc }}
-                </view>
-            </view>
-            <view class="prolist">
-                招工地址：{{ info.jobAddress }}
-            </view>
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                招工描述
+                <view class="protype">学历要求：{{ info.education }}</view>
+                <view class="protype">经验要求：{{ info.experienceDesc }}</view>
             </view>
+            <view class="prolist">招工地址：{{ info.jobAddress }}</view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">招工描述</view>
             <view class="prolist description">
                 {{ info.jobDescription }}
             </view>
@@ -70,16 +52,17 @@
             <!-- <view class="prolist">
 				用工单位：{{info.jobCompanyName}}
 			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;"
-                    mode=""></image>
-                <view style="font-size: 30rpx;">{{ info.jobCompanyName }}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.jobCompanyName }}</view>
             </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
@@ -91,38 +74,48 @@
             <!-- <view class="prolist" v-if="info.callNumber">
 				座机号：{{info.callNumber}}
 			</view> -->
-            <view class="prolist">
-                岗位地址：{{ info.address }}
-            </view>
+            <view class="prolist">岗位地址：{{ info.address }}</view>
             <view class="map">
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" :MapUrl="$config.supperMap"
-                    :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    :MapUrl="$config.supperMap"
+                    :flag-tip="false"
+                ></super-map>
             </view>
             <!-- <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map> -->
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow !== '0'"></view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
         <view class="btn">
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="min-height: 100rpx;padding: 60rpx 40rpx;">
+            <view style="min-height: 100rpx; padding: 60rpx 40rpx">
                 <view class="contactWrapper" v-for="(item, index) in info.applyList" :key="index">
                     <view>{{ item.realName }} : {{ item.telphone }}</view>
                     <view class="applyTime">申请时间：{{ item.applyTime }}</view>
@@ -133,7 +126,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -143,39 +136,25 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        recruit_missionDetail,
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../../../untils/format.js";
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    import {
-        getuserrecruitDetailApp
-    } from '@/api/userrecruit.js'
-    export default {
+import { mapGetters } from 'vuex';
+import { recruit_missionDetail } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../../../untils/format.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+import { getuserrecruitDetailApp } from '@/api/userrecruit.js';
+export default {
     data() {
         return {
             ...dictionary,
@@ -188,15 +167,18 @@
             loading: false,
             latitude: 39.909, //中心点
             longitude: 116.39742,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 0,
                     longitude: 0,
                     // width:30,
                     // height:30,
-                    iconPath: '../../../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -204,14 +186,15 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-                jobType: null
-            }
+            jobType: null,
+        };
     },
     components: {
         uniMask,
-            validCode
+        validCode,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.workId) {
             this.workId = decodeURIComponent(option.workId);
@@ -226,23 +209,25 @@
             this.id = option.id; //消息id
         }
         if (option.jobType) {
-                this.jobType = option.jobType
+            this.jobType = option.jobType;
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
-
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
-            callPhone() {
+        async callPhone() {
+            this.showPopUp = true;
+            await getPhoneCountNumber();
+
             this.showPopUp = true;
         },
         closePopUp() {
@@ -250,14 +235,14 @@
         },
         async getData() {
             const self = this;
-                let resData = null
+            let resData = null;
             if (this.jobType) {
                 resData = await getuserrecruitDetailApp({
                     id: this.id,
-                        jobType: this.jobType
-                    })
+                    jobType: this.jobType,
+                });
             } else {
-                    resData = await recruit_missionDetail(self.workId, self.type)
+                resData = await recruit_missionDetail(self.workId, self.type);
             }
             if (resData.data?.code === 200) {
                 self.info = resData.data.data;
@@ -272,66 +257,68 @@
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
     },
     computed: {
         ...mapGetters(['auth', 'autograph']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
-                }
-            }
-        }
+                return this.info.skillNames.split(',');
             }
+        },
+    },
+};
 </script>
 
 <style lang="scss">
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -365,15 +352,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -383,7 +369,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -399,24 +385,24 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
     border-radius: 10rpx;
@@ -424,9 +410,9 @@
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -435,19 +421,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -455,9 +441,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -465,31 +451,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -498,9 +482,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -508,20 +492,20 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 
-    .contactWrapper {
+.contactWrapper {
     box-sizing: border-box;
     text-align: center;
     font-size: 28rpx;
@@ -532,11 +516,10 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+}
 
-    }
-
-    .applyTime {
+.applyTime {
     font-size: 24rpx;
     color: #666666;
-    }
+}
 </style>

pages/recruit/subPage/newsDetail/workInfo.vue

@@ -7,45 +7,27 @@
             <!-- <view class="prolist">
 				任务编码：{{info.missionNo}}
 			</view> -->
-            <view class="prolist">
-                发布日期：{{ dateFormat((info.stime)) }}
-            </view>
-            <view class="prolist">
-                招聘人数：{{ info.peopleNum }}
-            </view>
-            <view class="prolist">
-                行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry }}
-            </view>
-            <view class="prolist">
-                工种类型：{{ info.skillNames }}
-            </view>
+            <view class="prolist">发布日期：{{ dateFormat(info.stime) }}</view>
+            <view class="prolist">招聘人数：{{ info.peopleNum }}</view>
+            <view class="prolist">行业类型：{{ info.tradeNames ? info.tradeNames : info.jobCompanyIndustry }}</view>
+            <view class="prolist">工种类型：{{ info.skillNames }}</view>
             <!-- <view class="fee">
 				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
 			</view> -->
         </view>
         <view class="head">
-            <view class="proname proneed">
-                岗位要求
-            </view>
+            <view class="proname proneed">岗位要求</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					年龄要求：{{age[info.ageDesc]}}
 				</view>
 			</view> -->
             <view class="prolist">
-                <view class="protype">
-                    学历要求：{{ info.education }}
-                </view>
-                <view class="protype">
-                    经验要求：{{ info.experienceDesc }}
-                </view>
-            </view>
-            <view class="prolist">
-                岗位地址：{{ info.jobAddress }}
-            </view>
-            <view class="prolist proint" style="font-weight: bold;color:#333;">
-                任务描述
+                <view class="protype">学历要求：{{ info.education }}</view>
+                <view class="protype">经验要求：{{ info.experienceDesc }}</view>
             </view>
+            <view class="prolist">岗位地址：{{ info.jobAddress }}</view>
+            <view class="prolist proint" style="font-weight: bold; color: #333">任务描述</view>
             <view class="prolist description">
                 {{ info.jobDescription }}
             </view>
@@ -56,9 +38,7 @@
                 </view>
             </view>
             <!-- 技能标签 end -->
-            <view v-if="info.jobSources" class="prolist">
-                来源：{{ info.jobSources }}
-            </view>
+            <view v-if="info.jobSources" class="prolist">来源：{{ info.jobSources }}</view>
         </view>
         <view class="head">
             <!-- <view class="proname proneed">
@@ -70,16 +50,17 @@
             <!-- <view class="prolist">
 				用工单位：{{info.jobCompanyName}}
 			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;"
-                    mode=""></image>
-                <view style="font-size: 30rpx;">{{ info.jobCompanyName }}</view>
+            <view style="display: flex; align-items: center">
+                <image
+                    src="../../../../static/img/city.png"
+                    style="width: 40rpx; height: 40rpx; margin-right: 20rpx"
+                    mode=""
+                ></image>
+                <view style="font-size: 30rpx">{{ info.jobCompanyName }}</view>
             </view>
         </view>
         <view class="head">
-            <view class="proname proneed">
-                地址
-            </view>
+            <view class="proname proneed">地址</view>
             <!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
@@ -91,38 +72,48 @@
             <!-- <view class="prolist" v-if="info.callNumber">
 				座机号：{{info.callNumber}}
 			</view> -->
-            <view class="prolist">
-                岗位地址：{{ info.address }}
-            </view>
+            <view class="prolist">岗位地址：{{ info.address }}</view>
             <view class="map">
-                <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
-                    :open="true" :zoom="14" :min-zoom="10" :max-zoom="20" :MapUrl="$config.supperMap"
-                    :flag-tip="false"></super-map>
+                <super-map
+                    ref="uMap"
+                    style="width: 100%; height: 100%"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :open="true"
+                    :zoom="14"
+                    :min-zoom="10"
+                    :max-zoom="20"
+                    :MapUrl="$config.supperMap"
+                    :flag-tip="false"
+                ></super-map>
             </view>
             <!-- <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map> -->
         </view>
-        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow !== '0'"></view>
+        <view class="" style="height: 200rpx; background-color: #f6f6f6" v-if="isShow !== '0'"></view>
         <view class="btn">
-            <view @click="callPhone" class="bottombtn flexbtn"
-                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+            <view
+                @click="callPhone"
+                class="bottombtn flexbtn"
+                style="margin-right: 10rpx; background-color: #fbad17; border-radius: 45rpx"
+            >
                 电话联系
             </view>
         </view>
         <uniMask :maskShow="maskShow">
             <view class="contractMask">
                 <!-- #ifdef H5 || APP-PLUS -->
-                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <view class="close" @click="close" style="top: 124rpx">+</view>
                 <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="close" @click="close">+</view>
                 <!-- #endif -->
-                <view style="height: 30px;"></view>
-                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view style="height: 30px"></view>
+                <img :src="src" alt="" style="width: 100%; height: 1000px" />
                 <view v-if="nextBtn" class="down" @click="next">下一步</view>
             </view>
         </uniMask>
         <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-            <view style="min-height: 100rpx;padding: 60rpx 40rpx;">
+            <view style="min-height: 100rpx; padding: 60rpx 40rpx">
                 <view class="contactWrapper" v-for="(item, index) in info.applyList" :key="index">
                     <view>{{ item.realName }} : {{ item.telphone }}</view>
                     <view class="applyTime">申请时间：{{ item.applyTime }}</view>
@@ -133,7 +124,7 @@
 
     <view v-else-if="showCode" class="codeSealBox">
         <!-- #ifdef H5 || APP-PLUS -->
-        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx">+</view>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <view class="closeCode" @click="closeShowCode">+</view>
@@ -143,39 +134,25 @@
             <view class="name">签名密码</view>
             <view class="tip">6位数字签名密码</view>
         </view>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-        <view style="height: 36px;"></view>
+        <view style="height: 36px"></view>
         <view class="forget" @click="forget">忘记密码？</view>
     </view>
 </template>
 
 <script>
-    import {
-        mapGetters
-    } from 'vuex'
-    import {
-        recruit_missionDetail
-    } from '@/api/mission.js';
-    import {
-        GoLogin
-    } from '@/untils/AxiosUtils.js';
-    import {
-        setRead
-    } from '@/api/news.js';
-    import {
-        checkPass
-    } from '@/api/auth.js';
-    import dictionary from '@/common/textdata.js';
-    import {
-        dateFormat
-    } from "../../../../untils/format.js";
-    import {
-        userrecruitDetail
-    } from '@/api/userrecruit.js'
-    import uniMask from '@/components/uni-mask/mask.vue'
-    import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    export default {
+import { mapGetters } from 'vuex';
+import { recruit_missionDetail } from '@/api/mission.js';
+import { GoLogin } from '@/untils/AxiosUtils.js';
+import { setRead } from '@/api/news.js';
+import { checkPass, getPhoneCountNumber } from '@/api/auth.js';
+import dictionary from '@/common/textdata.js';
+import { dateFormat } from '../../../../untils/format.js';
+import { userrecruitDetail } from '@/api/userrecruit.js';
+import uniMask from '@/components/uni-mask/mask.vue';
+import validCode from '@/components/p-valid-code/p-valid-code.vue';
+export default {
     data() {
         return {
             ...dictionary,
@@ -188,15 +165,18 @@
             loading: false,
             latitude: 39.909, //中心点
             longitude: 116.39742,
-                covers: [{ //marker标记位置
+            covers: [
+                {
+                    //marker标记位置
                     id: 0,
                     latitude: 0,
                     longitude: 0,
                     // width:30,
                     // height:30,
-                    iconPath: '../../../../static/img/location.png'
-                }],
-                missionNo: "",
+                    iconPath: '../../../../static/img/location.png',
+                },
+            ],
+            missionNo: '',
             isShow: '',
             type: '',
             id: '',
@@ -204,13 +184,14 @@
             maxlength: 6,
             collectStatus: 0, // 收藏状态
             showPopUp: false,
-            }
+        };
     },
     components: {
         uniMask,
-            validCode
+        validCode,
     },
-        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+    onLoad: function (option) {
+        //option为object类型，会序列化上个页面传递的参数
         // this.$store.dispatch('setAutograph')
         if (option.workId) {
             this.workId = decodeURIComponent(option.workId);
@@ -225,28 +206,29 @@
             this.id = option.id; //消息id
         }
     },
-        onShow: function() {
-            this.showDetail = true
+    onShow: function () {
+        this.showDetail = true;
         this.getData();
-
     },
     onShareAppMessage(obj) {
         return {
             title: this.info.missionTitle,
-                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-            }
+            path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`,
+        };
     },
     methods: {
         dateFormat,
-            callPhone() {
+        async callPhone() {
             this.showPopUp = true;
+            await getPhoneCountNumber();
         },
         closePopUp() {
             this.showPopUp = false;
         },
-            getData: function() {
+        getData: function () {
             const self = this;
-                recruit_missionDetail(self.workId, self.type).then(res => {
+            recruit_missionDetail(self.workId, self.type).then(
+                (res) => {
                     self.info = res.data.data;
                     self.status = res.data.data.status;
                     self.missionNo = res.data.data.missionNo;
@@ -255,72 +237,76 @@
                     self.covers[0].latitude = self.info.lat;
                     self.covers[0].longitude = self.info.lon;
                     self.showDetail = true;
-                }, error => {
+                },
+                (error) => {
                     console.log(error);
-                });
+                }
+            );
         },
         // 查看合同
         lookMask() {
-                this.maskShow = true
+            this.maskShow = true;
         },
         // 关闭弹窗
         close() {
-                this.maskShow = false
+            this.maskShow = false;
         },
         // 合同下一步
         next() {
-                this.maskShow = false
-                this.showDetail = false
-                this.showCode = true
+            this.maskShow = false;
+            this.showDetail = false;
+            this.showCode = true;
         },
         // 输入签名密码
         getInpCode(password) {
             uni.showLoading({
-                    title: "请求中..."
-                })
-                this.loading = true
+                title: '请求中...',
+            });
+            this.loading = true;
             var obj = {
-                    pass: password
-                }
-                checkPass(obj).then(res => {
-                    this.submitTask()
-                    this.closeShowCode()
-                }).catch(err => {
-                    this.loading = false
+                pass: password,
+            };
+            checkPass(obj)
+                .then((res) => {
+                    this.submitTask();
+                    this.closeShowCode();
                 })
+                .catch((err) => {
+                    this.loading = false;
+                });
         },
         // 关闭签名密码弹窗
         closeShowCode() {
-                this.showCode = false
-                this.showDetail = true
+            this.showCode = false;
+            this.showDetail = true;
         },
         // 忘记密码
         forget() {
             uni.navigateTo({
-                    url: `/pageMy/setUserBase/seal/forget?forget=true`
-                })
-            }
+                url: `/pageMy/setUserBase/seal/forget?forget=true`,
+            });
+        },
     },
     computed: {
         ...mapGetters(['auth', 'autograph']),
         skillNames() {
             if (this.info.skillNames) {
-                    return this.info.skillNames.split(',')
-                }
-            }
-        }
+                return this.info.skillNames.split(',');
             }
+        },
+    },
+};
 </script>
 
 <style lang="scss">
-    .codeSealBox {
+.codeSealBox {
     padding: 285rpx 72rpx 0 72rpx;
 
     .closeCode {
         position: absolute;
         right: 36rpx;
         top: 120rpx;
-            color: #1B66FF;
+        color: #1b66ff;
         transform: rotate(45deg);
         font-size: 40px;
     }
@@ -354,15 +340,14 @@
         font-size: 28rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-            color: #5AA0FA;
+        color: #5aa0fa;
         line-height: 38rpx;
         text-align: right;
     }
+}
 
-    }
-
-    .contractMask {
-        background-color: #FFFFFF;
+.contractMask {
+    background-color: #ffffff;
     margin: 30rpx;
     position: relative;
     border-radius: 4px;
@@ -372,7 +357,7 @@
     .close {
         width: 23px;
         height: 23px;
-            color: #1B66FF;
+        color: #1b66ff;
         position: fixed;
         right: 60rpx;
         top: 60rpx;
@@ -388,24 +373,24 @@
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
-            background: #1B66FF;
+        background: #1b66ff;
         font-size: 36rpx;
         font-weight: 400;
-            color: #FFFFFF;
-        }
+        color: #ffffff;
     }
+}
 
-    .lookContract {
+.lookContract {
     width: 30%;
     margin-right: 30rpx;
-    }
+}
 
-    .flexbtn {
+.flexbtn {
     flex: 1;
-    }
+}
 
-    .bottombtn {
-        background-color: #1B66FF;
+.bottombtn {
+    background-color: #1b66ff;
     color: #fff;
     text-align: center;
     border-radius: 10rpx;
@@ -413,9 +398,9 @@
     font-size: 32rpx;
     height: 90rpx;
     line-height: 90rpx;
-    }
+}
 
-    .btn {
+.btn {
     background-color: #fefefe;
     width: 690rpx;
     padding: 30rpx;
@@ -424,19 +409,19 @@
     bottom: 0;
     left: 0;
     display: flex;
-    }
+}
 
-    .disabledBtn {
+.disabledBtn {
     background-color: #c8c9cc;
-    }
+}
 
-    .map {
+.map {
     width: 100%;
     height: 350rpx;
     margin-top: 30rpx;
-    }
+}
 
-    .askList {
+.askList {
     font-family: PingFangSC-Regular;
     font-size: 24rpx;
     color: #666666;
@@ -444,9 +429,9 @@
     padding: 5rpx 15rpx;
     margin-right: 10rpx;
     margin-top: 15rpx;
-    }
+}
 
-    .ask {
+.ask {
     overflow: hidden;
     width: 100%;
     display: flex;
@@ -454,31 +439,29 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     margin: 20rpx 0;
+}
 
-    }
-
-    .proint {
+.proint {
     margin-top: 30rpx;
     font-size: 30rpx !important;
-    }
+}
 
-    .proneed {
+.proneed {
     font-size: 32rpx !important;
+}
 
-    }
-
-    .fee {
+.fee {
     font-family: PingFangSC-Medium;
     font-size: 32rpx;
-        color: #F46161;
+    color: #f46161;
     margin-top: 30rpx;
-    }
+}
 
-    .protype {
+.protype {
     width: 50%;
-    }
+}
 
-    .prolist {
+.prolist {
     font-family: PingFangSC-Regular;
     font-size: 28rpx;
     color: #666666;
@@ -487,9 +470,9 @@
     justify-content: space-between;
     text-align: left;
     padding: 5rpx 0;
-    }
+}
 
-    .proname {
+.proname {
     font-weight: bold;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
@@ -497,20 +480,20 @@
     width: 90%;
     overflow: hidden;
     padding-bottom: 20rpx;
-    }
+}
 
-    .head {
+.head {
     padding: 30rpx;
     background: #fefefe;
     border-bottom: 20rpx solid #f6f6f6;
-    }
+}
 
-    .description {
+.description {
     word-break: break-all;
     white-space: pre-line;
-    }
+}
 
-    .contactWrapper {
+.contactWrapper {
     box-sizing: border-box;
     text-align: center;
     font-size: 28rpx;
@@ -521,11 +504,10 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+}
 
-    }
-
-    .applyTime {
+.applyTime {
     font-size: 24rpx;
     color: #666666;
-    }
+}
 </style>

pages/seach/seach.vue

@@ -1,54 +1,18 @@
 <template>
     <view class="mainWrapper">
-        <view v-show="!searchResultShow" class="headSearch">
+        <view class="headSearch">
             <view class="search-view">
                 <view class="search-item">
                     <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image>
-                    <input type="text" confirm-type="搜索" v-model="keywords" @confirm="getNewList('search')"
+                    <input type="text" confirm-type="搜索" v-model="keywords" @confirm="getList"
                         placeholder="搜零工岗位/搜全职岗位/搜政策" />
-                    <view @click="getNewList('search')"
+                    <view @click="getList"
                         style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">
                         搜索</view>
                 </view>
-                <!-- <view class="close" @click="closeBack">
-					取消
-				</view> -->
             </view>
         </view>
-        <view v-show="searchResultShow" class="headSearch">
-            <view class="search-view">
-                <view class="search-item" @click="clearCurrentKeyWords">
-                    <!-- <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image> -->
-                    <!-- <input type="text" confirm-type="搜索" v-model="keywords" @confirm="getNewList('search')"
-						placeholder="搜零工任务/搜岗位/搜政策" /> -->
-                    <!-- <view @click="getNewList('search')" style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">搜索</view> -->
-                    <view
-                        style="font-size: 24rpx;height: 50rpx;background-color: #ddd;border-radius: 25rpx;line-height: 50rpx;padding: 0 20rpx;padding-right: 40rpx;position:relative;">
-                        {{ keywords }}
-                        <u-icon name="close" size="14" style="position:absolute;right:10rpx;top:13rpx;"></u-icon>
-                    </view>
-
-                </view>
-
-            </view>
-        </view>
-        <view v-show="searchResultShow" class="search-result">
-            <view class="title">搜索结果</view>
-            <view v-for="(item, index) in searchResultList" class="search-item" @click="toDetail(item)">
-                <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;margin-right: 10rpx;"
-                    mode=""></image>
-                <view style="flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.name }}</view>
-                <view class="type" v-if="item.type == 0">零工岗位</view>
-                <view class="type" v-else-if="item.type == 1">全职岗位</view>
-                <view class="type" v-else-if="item.type == 2">政策</view>
-                <view class="type" v-else-if="item.type == 3">招工</view>
-            </view>
-            <view v-if="searchResultList.length > 0"
-                style="text-align: center;font-size: 26rpx;margin-top: 20rpx;color:#999;">没有更多数据了</view>
-            <view v-if="searchResultList.length == 0" style="text-align: center;font-size: 26rpx;margin-top: 20rpx;">
-                暂无数据</view>
-        </view>
-        <view v-show="!searchResultShow" class="search-history">
+        <view class="search-history">
             <view class="title">搜索记录</view>
             <view class="clear" @click="clearKeyWords">
                 <image src="../../static/img/delete.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
@@ -60,15 +24,14 @@
                 </view>
             </view>
             <view v-else class="empty">暂无历史记录</view>
+            <v-tabs :tabs="tabList" height="45px" v-model="activeTab" color="#999" activeColor="#000" fontSize="30rpx"
+                activeFontSize="31rpx" @change='changeTab' />
+
         </view>
-        <v-tabs v-show="!searchResultShow" :tabs="['推荐零工岗位', '推荐全职岗位', '推荐政策']" height="45px" v-model="activeTab"
-            color="#999" activeColor="#000" fontSize="30rpx" activeFontSize="31rpx" @change='changeTab' />
-
-
-        <block v-if="(activeTab == 0)&&!searchResultShow">
-            <view v-if="companyList.length > 0">
+        <block v-if="activeTab === 0">
+            <view v-if="companyList.length ">
                 <block v-for="(item, index) in companyList" :key="item.id">
-                    <companyList :companyitem="item"></companyList>
+                    <companyList :companyitem="item" :location="userLocation"></companyList>
                 </block>
             </view>
             <view v-else>
@@ -78,10 +41,10 @@
                 </view>
             </view>
         </block>
-        <block v-if="(activeTab == 1)&&!searchResultShow">
-            <view v-if="newList.length > 0">
+        <block v-if="activeTab === 1">
+            <view v-if="newList.length">
                 <block v-for="(item, index) in newList" :key="item.id">
-                    <workList :companyitem="item" :near="activeTab === 0"></workList>
+                    <workList :companyitem="item" :near="activeTab === 0" :location="userLocation"></workList>
                 </block>
             </view>
             <view v-else>
@@ -92,8 +55,8 @@
 
 
 
-        <block v-if="(activeTab == 2)&&!searchResultShow">
-            <view v-if="recommendList.length > 0">
+        <block v-if="activeTab == 2">
+            <view v-if="recommendList.length">
                 <!--    <block v-for="(item, index) in recommendList" :key="item.id">
                     <companyList :companyitem="item"></companyList>
                 </block> -->
@@ -109,7 +72,7 @@
             <view v-else>
                 <image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
                 <view class="nothingContnt">
-                    完善技能，获取精推荐
+                    暂无信息
                 </view>
                 <!-- <view class="btn" @click="goResume">
         			完善技能
@@ -117,86 +80,78 @@
             </view>
         </block>
 
-        <!-- <view v-if="companyList.length > 0">
-			<block v-for="(item, index) in companyList" :key="item.id">
-				<companyList :companyitem="item"></companyList>
-				<view class="baddd"></view>
-			</block>
-		</view>
-		<view v-else>
+        <block v-if="activeTab == -1">
+            <view>
                 <image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
                 <view class="nothingContnt">
-				暂无任务信息
+                    没有更多数据
                 </view>
-		</view> -->
+            </view>
+        </block>
     </view>
 </template>
 
 <script>
+    import {
+        cloneDeep
+    } from 'lodash';
     import {
         newMissionAll,
         getSearchKeyWordsList,
         clearSearchKeyWords,
         getListByKeyWords,
         nearMission,
-        getPolicyContentList
+        getPolicyContentList,
+        userWorkSearchListAll
     } from '@/api/mission.js';
+    import {
+        mapGetters
+    } from 'vuex'
     import companyList from '@/components/companyList/companyList.vue';
-    import vTabs from '@/components/v-tabs/v-tabs.vue';
-    import testData from '@/common/textdata.js';
     import workList from '@/components/companyList/workList.vue'
+    const titleStatus = {
+        'mission': {
+            title: '零工岗位',
+            val: 0,
+        },
+        'work': {
+            title: '全职岗位',
+            val: 1,
+        },
+        'policy': {
+            title: '政策',
+            val: 2,
+        },
+    }
     export default {
         components: {
             companyList,
-            vTabs,
             workList
         },
         data() {
             return {
                 activeTab: 0,
-                companyList: [],
-                recommendList: [],
-                newList: [],
                 keywords: '',
-                page: {
-                    current: 1,
-                    size: 10,
-                    total: 0
-                },
                 searchHistoryList: [],
-                searchResultShow: false,
-                searchResultList: []
-            };
+                companyList: [],
+                newList: [],
+                recommendList: [],
+                tabList: ['零工岗位', '全职岗位', '政策']
+            }
         },
-        onLoad: function(option) {
-            this.keywords = option.keywords ? option.keywords : ''
+        computed: {
+            ...mapGetters(['userLocation']),
         },
         onShow: function() {
-            this.getList('refresh');
             this.getKeyWordsList()
         },
-        /*页面滚动到底部*/
-        onReachBottom: function() {
-            this.upLoad()
-        },
         methods: {
-            clearCurrentKeyWords() {
-                this.keywords = '';
-                let that = this;
-                setTimeout(function() {
-                    that.searchResultShow = false;
-                }, 100);
-
-            },
-            // 新面板搜索
-            getNewList() {
-                getListByKeyWords(this.keywords).then(res => {
-                    this.searchResultShow = true
-                    this.searchResultList = res.data.data
-                    // this.searchResultList.forEach((item, index) => {
-                    // 	item.name = this.getInf(item.name, this.keywords);
-                    // })
+            goPolicyInfo(data) {
+                if (data) {
+                    uni.navigateTo({
+                        url: `/pages/user/policyContent?id=${data}`
                     })
+                }
             },
             // 获取搜索历史记录
             getKeyWordsList() {
@@ -211,142 +166,6 @@
                 // console.log(keyWords)
                 this.searchResultShow = true;
                 this.keywords = keyWords;
-                this.getNewList();
-            },
-            //最新任务；
-            getList: function(type = 'add') {
-                //改变搜索条件，页码值变为1
-                if (type === 'refresh') {
-                    this.page.current = 1;
-                };
-                // if (this.keywords) {
-                newMissionAll(this.page.current, this.page.size, this.keywords).then(res => {
-                    this.page.total = res.data.data.total;
-                    if (type === 'refresh') {
-                        this.companyList = res.data.data.records
-                    } else if (res.data.data && res.data.data.records.length) {
-                        this.companyList = this.companyList.concat(res.data.data.records);
-                    }
-                    this.page.current += 1;
-                })
-            },
-            getgwList(type = 'add') {
-                if (type === 'refresh') {
-                    this.page.current = 1;
-                };
-                nearMission(this.page.current, this.page.size).then(res => {
-                    this.page.total = res.data.data.total;
-                    if (type === 'refresh') {
-                        this.newList = res.data.data.records
-                    } else if (res.data.data && res.data.data.records.length) {
-                        this.newList = this.newList.concat(res.data.data.records);
-                    }
-                    this.page.current += 1;
-                })
-            },
-            getPoliyList(type = 'add') {
-                if (type === 'refresh') {
-                    this.page.current = 1;
-                };
-                let params = {
-                    current: this.page.current,
-                    size: this.page.size,
-                    type: 1
-                }
-                getPolicyContentList(params).then(res => {
-                    this.page.total = res.data.data.total;
-                    if (type === 'refresh') {
-                        this.recommendList = res.data.data.records
-                    } else if (res.data.data && res.data.data.records.length) {
-                        this.recommendList = this.recommendList.concat(res.data.data.records);
-                    }
-                    this.page.current += 1;
-                })
-            },
-            goPolicyInfo(data) {
-                if (data) {
-                    uni.navigateTo({
-                        url: `/pages/user/policyContent?id=${data}`
-                    })
-                } else {
-                    // uni.showToast({
-                    // 	title:'暂无内容',
-                    // 	icon:'none'
-                    // })
-                }
-            },
-            //上拉加载
-            upLoad: function() {
-                if (this.page.current <= Math.ceil(this.page.total / this.page.size)) {
-                    switch (this.activeTab) {
-                        case 0:
-                            this.getList();
-                            break;
-                        case 1:
-                            this.getgwList();
-                            break;
-                        case 2:
-                            this.getPoliyList()
-                            break;
-                    }
-                } else {
-                    uni.showToast({
-                        icon: "none",
-                        title: '已经是最后一页',
-                    })
-                    return
-                }
-            },
-            closeBack() {
-                uni.navigateBack({
-                    delta: 1
-                })
-            },
-            /**
-             * 指定关键字高亮
-             * @param {*} str 字符串
-             * @param {*} key  关键字
-             */
-            getInf(str, key) {
-                if (str && key) {
-                    let replaceReg = new RegExp(key, 'g') // 匹配关键字正则
-                    let replaceString = "<span style='color: #1b66ff;'>" + key + "</span>" // 高亮替换
-                    return str.replace(replaceReg, replaceString);
-                }
-            },
-
-            toDetail(item) {
-                const no = item.id
-                // 判断是岗位还是任务 0：任务，1：岗位，2：政策
-                if (item.type == 0) {
-                    uni.navigateTo({
-                        url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=1`
-                    })
-                } else if (item.type == 1) {
-                    uni.navigateTo({
-                        url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=1`
-                    })
-                } else if (item.type == 2) {
-                    uni.navigateTo({
-                        url: `/pages/user/policyContent?id=${no}`
-                    })
-                }
-
-            },
-
-            changeTab: function(e) {
-                this.activeTab = e;
-                switch (e) {
-                    case 0:
-                        this.getList('refresh');
-                        break;
-                    case 1:
-                        this.getgwList('refresh');
-                        break;
-                    case 2:
-                        this.getPoliyList('refresh')
-                        break;
-                }
             },
             // 清空搜索历史
             clearKeyWords() {
@@ -355,15 +174,55 @@
                         this.getKeyWordsList()
                     }
                 })
+            },
+            changeTab: function(e) {
+                this.activeTab = e;
+                // const tab = cloneDeep(this.tabList[e])
+                // Object.keys(titleStatus).map((key) => {
+                //     if (titleStatus[key].title === tab) {
+                //         this.activeTab = titleStatus[key].val;
+                //     }
+                // })
+            },
+            async getList() {
+                const params = {
+                    keywords: this.keywords
                 }
-        }
-    };
-</script>
+                let resData = await userWorkSearchListAll(params)
+                if (resData.data.code === 200) {
+                    const {
+                        mission,
+                        policy,
+                        work
+                    } = resData.data.data
 
+                    const tabVal = []
+                    Object.keys(titleStatus).map((key) => {
+                        if (resData.data.data[key].length) {
+                            tabVal.push(titleStatus[key].title)
+                        }
+                    })
+                    if (tabVal.length) {
+                        let count = 0
+                        Object.keys(titleStatus).map((key) => {
+                            if (!count && titleStatus[key].title === tabVal[0]) {
+                                this.activeTab = titleStatus[key].val;
+                                count++
+                            }
+                        })
+                    }
+                    this.companyList = mission
+                    this.recommendList = policy
+                    this.newList = work
+                }
+            }
+        }
+    }
+</script>
 <style scoped>
     .mainWrapper {
         background-color: #f3f4f8;
-        min-height: 95vh;
+        min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     }
 
     .baddd {
@@ -475,6 +334,7 @@
         padding: 8rpx 12rpx;
         border-radius: 20rpx;
         margin-right: 10rpx;
+        position: relative;
     }
 
     .search-result {

pages/seach/seachCopy.vue

@@ -0,0 +1,517 @@
+<template>
+    <view class="mainWrapper">
+        <view v-show="!searchResultShow" class="headSearch">
+            <view class="search-view">
+                <view class="search-item">
+                    <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image>
+                    <input type="text" confirm-type="搜索" v-model="keywords" @confirm="getNewList('search')"
+                        placeholder="搜零工岗位/搜全职岗位/搜政策" />
+                    <view @click="getNewList('search')"
+                        style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">
+                        搜索</view>
+                </view>
+                <!-- <view class="close" @click="closeBack">
+					取消
+				</view> -->
+            </view>
+        </view>
+        <view v-show="searchResultShow" class="headSearch">
+            <view class="search-view">
+                <view class="search-item" @click="clearCurrentKeyWords">
+                    <!-- <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image> -->
+                    <!-- <input type="text" confirm-type="搜索" v-model="keywords" @confirm="getNewList('search')"
+						placeholder="搜零工任务/搜岗位/搜政策" /> -->
+                    <!-- <view @click="getNewList('search')" style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">搜索</view> -->
+                    <view
+                        style="font-size: 24rpx;height: 50rpx;background-color: #ddd;border-radius: 25rpx;line-height: 50rpx;padding: 0 20rpx;padding-right: 40rpx;position:relative;">
+                        {{ keywords }}
+                        <u-icon name="close" size="14" style="position:absolute;right:10rpx;top:13rpx;"></u-icon>
+                    </view>
+
+                </view>
+
+            </view>
+        </view>
+        <view v-show="searchResultShow" class="search-result">
+            <view>
+                <view>岗位/任务</view>
+                <view>政策</view>
+            </view>
+            <view class="title">搜索结果</view>
+            <view v-for="(item, index) in searchResultList" class="search-item" @click="toDetail(item)">
+                <image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;margin-right: 10rpx;"
+                    mode=""></image>
+                <view style="flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.name }}</view>
+                <view class="type" v-if="item.type == 0">零工岗位</view>
+                <view class="type" v-else-if="item.type == 1">全职岗位</view>
+                <view class="type" v-else-if="item.type1 == 2">政策</view>
+                <view class="type" v-else-if="item.type == 3">招工</view>
+            </view>
+            <view v-if="searchResultList.length > 0"
+                style="text-align: center;font-size: 26rpx;margin-top: 20rpx;color:#999;">没有更多数据了</view>
+            <view v-if="searchResultList.length == 0" style="text-align: center;font-size: 26rpx;margin-top: 20rpx;">
+                暂无数据</view>
+        </view>
+        <view v-show="!searchResultShow" class="search-history">
+            <view class="title">搜索记录</view>
+            <view class="clear" @click="clearKeyWords">
+                <image src="../../static/img/delete.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
+                <view style="margin-left: 5rpx;">清空</view>
+            </view>
+            <view class="wrapper" v-if="searchHistoryList.length > 0">
+                <view class="item" v-for="(item, index) in searchHistoryList" @click="keyWordsClick(item.keywords)">
+                    {{ item.keywords }}
+                </view>
+            </view>
+            <view v-else class="empty">暂无历史记录</view>
+        </view>
+        <v-tabs v-show="!searchResultShow" :tabs="['推荐零工岗位', '推荐全职岗位', '推荐政策']" height="45px" v-model="activeTab"
+            color="#999" activeColor="#000" fontSize="30rpx" activeFontSize="31rpx" @change='changeTab' />
+
+
+        <block v-if="(activeTab == 0)&&!searchResultShow">
+            <view v-if="companyList.length > 0">
+                <block v-for="(item, index) in companyList" :key="item.id">
+                    <companyList :companyitem="item"></companyList>
+                </block>
+            </view>
+            <view v-else>
+                <image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+                <view class="nothingContnt">
+                    暂无信息
+                </view>
+            </view>
+        </block>
+        <block v-if="(activeTab == 1)&&!searchResultShow">
+            <view v-if="newList.length > 0">
+                <block v-for="(item, index) in newList" :key="item.id">
+                    <workList :companyitem="item" :near="activeTab === 0"></workList>
+                </block>
+            </view>
+            <view v-else>
+                <image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
+                <view class="nothingContnt">暂无信息</view>
+            </view>
+        </block>
+
+
+
+        <block v-if="(activeTab == 2)&&!searchResultShow">
+            <view v-if="recommendList.length > 0">
+                <!--    <block v-for="(item, index) in recommendList" :key="item.id">
+                    <companyList :companyitem="item"></companyList>
+                </block> -->
+                <view v-for="(item, index) in recommendList" :key="index"
+                    style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center"
+                    @click="goPolicyInfo(item.id)">
+                    <image :src="item.headPic" style="width: 60rpx;height: 60rpx;margin: 0 20rpx;"></image>
+                    <view style="font-size: 26rpx;">{{ item.articleTitle }}</view>
+                </view>
+            </view>
+
+
+            <view v-else>
+                <image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+                <view class="nothingContnt">
+                    完善技能，获取精推荐
+                </view>
+                <!-- <view class="btn" @click="goResume">
+					完善技能
+				</view> -->
+            </view>
+        </block>
+
+        <!-- <view v-if="companyList.length > 0">
+			<block v-for="(item, index) in companyList" :key="item.id">
+				<companyList :companyitem="item"></companyList>
+				<view class="baddd"></view>
+			</block>
+		</view>
+		<view v-else>
+			<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+			<view class="nothingContnt">
+				暂无任务信息
+			</view>
+		</view> -->
+    </view>
+</template>
+
+<script>
+    import {
+        newMissionAll,
+        getSearchKeyWordsList,
+        clearSearchKeyWords,
+        getListByKeyWords,
+        nearMission,
+        getPolicyContentList
+    } from '@/api/mission.js';
+    import companyList from '@/components/companyList/companyList.vue';
+    import vTabs from '@/components/v-tabs/v-tabs.vue';
+    import testData from '@/common/textdata.js';
+    import workList from '@/components/companyList/workList.vue'
+    export default {
+        components: {
+            companyList,
+            vTabs,
+            workList
+        },
+        data() {
+            return {
+                activeTab: 0,
+                companyList: [],
+                recommendList: [],
+                newList: [],
+                keywords: '',
+                page: {
+                    current: 1,
+                    size: 10,
+                    total: 0
+                },
+                searchHistoryList: [],
+                searchResultShow: false,
+                searchResultList: []
+            };
+        },
+        onLoad: function(option) {
+            this.keywords = option.keywords ? option.keywords : ''
+        },
+        onShow: function() {
+            this.getList('refresh');
+            this.getKeyWordsList()
+        },
+        /*页面滚动到底部*/
+        onReachBottom: function() {
+            this.upLoad()
+        },
+        methods: {
+            clearCurrentKeyWords() {
+                this.keywords = '';
+                let that = this;
+                setTimeout(function() {
+                    that.searchResultShow = false;
+                }, 100);
+
+            },
+            // 新面板搜索
+            getNewList() {
+                getListByKeyWords(this.keywords).then(res => {
+                    this.searchResultShow = true
+                    this.searchResultList = res.data.data
+                    // this.searchResultList.forEach((item, index) => {
+                    // 	item.name = this.getInf(item.name, this.keywords);
+                    // })
+                })
+            },
+            // 获取搜索历史记录
+            getKeyWordsList() {
+                getSearchKeyWordsList().then(res => {
+                    let response = res.data
+                    if (response.code == 200) {
+                        this.searchHistoryList = response.data
+                    }
+                })
+            },
+            keyWordsClick(keyWords) {
+                // console.log(keyWords)
+                this.searchResultShow = true;
+                this.keywords = keyWords;
+                this.getNewList();
+            },
+            //最新任务；
+            getList: function(type = 'add') {
+                //改变搜索条件，页码值变为1
+                if (type === 'refresh') {
+                    this.page.current = 1;
+                };
+                // if (this.keywords) {
+                newMissionAll(this.page.current, this.page.size, this.keywords).then(res => {
+                    this.page.total = res.data.data.total;
+                    if (type === 'refresh') {
+                        this.companyList = res.data.data.records
+                    } else if (res.data.data && res.data.data.records.length) {
+                        this.companyList = this.companyList.concat(res.data.data.records);
+                    }
+                    this.page.current += 1;
+                })
+            },
+            getgwList(type = 'add') {
+                if (type === 'refresh') {
+                    this.page.current = 1;
+                };
+                nearMission(this.page.current, this.page.size).then(res => {
+                    this.page.total = res.data.data.total;
+                    if (type === 'refresh') {
+                        this.newList = res.data.data.records
+                    } else if (res.data.data && res.data.data.records.length) {
+                        this.newList = this.newList.concat(res.data.data.records);
+                    }
+                    this.page.current += 1;
+                })
+            },
+            getPoliyList(type = 'add') {
+                if (type === 'refresh') {
+                    this.page.current = 1;
+                };
+                let params = {
+                    current: this.page.current,
+                    size: this.page.size,
+                    type: 1
+                }
+                getPolicyContentList(params).then(res => {
+                    this.page.total = res.data.data.total;
+                    if (type === 'refresh') {
+                        this.recommendList = res.data.data.records
+                    } else if (res.data.data && res.data.data.records.length) {
+                        this.recommendList = this.recommendList.concat(res.data.data.records);
+                    }
+                    this.page.current += 1;
+                })
+            },
+            goPolicyInfo(data) {
+                if (data) {
+                    uni.navigateTo({
+                        url: `/pages/user/policyContent?id=${data}`
+                    })
+                } else {
+                    // uni.showToast({
+                    // 	title:'暂无内容',
+                    // 	icon:'none'
+                    // })
+                }
+            },
+            //上拉加载
+            upLoad: function() {
+                if (this.page.current <= Math.ceil(this.page.total / this.page.size)) {
+                    switch (this.activeTab) {
+                        case 0:
+                            this.getList();
+                            break;
+                        case 1:
+                            this.getgwList();
+                            break;
+                        case 2:
+                            this.getPoliyList()
+                            break;
+                    }
+                } else {
+                    uni.showToast({
+                        icon: "none",
+                        title: '已经是最后一页',
+                    })
+                    return
+                }
+            },
+            closeBack() {
+                uni.navigateBack({
+                    delta: 1
+                })
+            },
+            /**
+             * 指定关键字高亮
+             * @param {*} str 字符串
+             * @param {*} key  关键字
+             */
+            getInf(str, key) {
+                if (str && key) {
+                    let replaceReg = new RegExp(key, 'g') // 匹配关键字正则
+                    let replaceString = "<span style='color: #1b66ff;'>" + key + "</span>" // 高亮替换
+                    return str.replace(replaceReg, replaceString);
+                }
+            },
+
+            toDetail(item) {
+                const no = item.id
+                // 判断是岗位还是任务 0：任务，1：岗位，2：政策
+                if (item.type == 0) {
+                    uni.navigateTo({
+                        url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=1`
+                    })
+                } else if (item.type == 1) {
+                    uni.navigateTo({
+                        url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=1`
+                    })
+                } else if (item.type == 2) {
+                    uni.navigateTo({
+                        url: `/pages/user/policyContent?id=${no}`
+                    })
+                }
+
+            },
+
+            changeTab: function(e) {
+                this.activeTab = e;
+                switch (e) {
+                    case 0:
+                        this.getList('refresh');
+                        break;
+                    case 1:
+                        this.getgwList('refresh');
+                        break;
+                    case 2:
+                        this.getPoliyList('refresh')
+                        break;
+                }
+            },
+            // 清空搜索历史
+            clearKeyWords() {
+                clearSearchKeyWords().then(res => {
+                    if (res.data.code == 200) {
+                        this.getKeyWordsList()
+                    }
+                })
+            }
+        }
+    };
+</script>
+
+<style scoped>
+    .mainWrapper {
+        background-color: #f3f4f8;
+        min-height: 95vh;
+    }
+
+    .baddd {
+        background-color: #f6f6f6;
+        height: 20rpx;
+    }
+
+    .close {
+        position: absolute;
+        right: 24rpx;
+        top: 6rpx;
+        height: 60rpx;
+        padding: 5rpx 0;
+        line-height: 60rpx;
+        font-family: PingFangSC-Regular;
+        font-size: 32rpx;
+        color: #333333;
+    }
+
+    .headSearch .search-view {
+        border-bottom: 1rpx solid #dddddd;
+        padding: 14rpx 32rpx;
+        background: rgba(255, 255, 255, 1);
+    }
+
+    .headSearch .search-item {
+        display: flex;
+        padding: 0 10rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        background: rgba(249, 249, 249, 1);
+        border-radius: 200px;
+        align-items: center;
+        border: 1px solid #0091ff;
+    }
+
+    .headSearch .search-item input {
+        padding: 0 24rpx;
+        height: 80rpx;
+        font-weight: 400;
+        flex: 1;
+        text-align: start;
+        font-size: 28rpx;
+        font-family: PingFang-SC-Bold, PingFang-SC;
+        color: rgba(51, 51, 51, 1);
+    }
+
+    .headSearch .search-item .placeholderClass {
+        color: #CCCCCC;
+    }
+
+    .headSearch .search-item image {
+        height: 32rpx;
+        width: 32rpx;
+    }
+
+    .nothing {
+        width: 400rpx;
+        height: 200rpx;
+        display: block;
+        margin: 0 auto;
+        margin-top: 50%;
+    }
+
+    .nothingContnt {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #333333;
+        margin-top: 30rpx;
+        text-align: center;
+    }
+
+    .search-history {
+        background-color: #fff;
+        padding: 10rpx 40rpx;
+        position: relative;
+    }
+
+    .search-history .title {
+        font-size: 28rpx;
+        font-weight: bold;
+    }
+
+    .search-history .clear {
+        position: absolute;
+        right: 40rpx;
+        top: 10rpx;
+        font-size: 24rpx;
+        display: flex;
+        align-items: center;
+        color: #707070;
+    }
+
+    .search-history .empty {
+        font-size: 24rpx;
+        text-align: center;
+        color: #707070;
+    }
+
+    .search-history .wrapper {
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 10rpx;
+    }
+
+    .search-history .wrapper .item {
+        font-size: 24rpx;
+        background-color: #f6f6f6;
+        padding: 8rpx 12rpx;
+        border-radius: 20rpx;
+        margin-right: 10rpx;
+    }
+
+    .search-result {
+        padding: 20rpx 30rpx;
+        background-color: #fff;
+        height: 100vh;
+    }
+
+    .search-result .title {
+        font-size: 26rpx;
+        font-weight: bold;
+        border-bottom: 1rpx solid #ddd;
+        height: 60rpx;
+        line-height: 60rpx;
+    }
+
+    .search-result .search-item {
+        display: flex;
+        align-items: center;
+        font-size: 26rpx;
+        border-bottom: 1rpx solid #ddd;
+        height: 80rpx;
+        line-height: 80rpx;
+
+    }
+
+    .search-result .search-item .type {
+        font-size: 20rpx;
+        color: #707070;
+        background-color: #dddddd;
+        border-radius: 15rpx;
+        height: 30rpx;
+        line-height: 30rpx;
+        padding: 0 20rpx;
+    }
+</style>