flat: 国庆节暂存

App.vue

@@ -7,26 +7,42 @@
     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')
             if (options.query.token) {
-                uni.reLaunch({
+                this.tokenlogin(options.query.token).then(() => {
-                    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.$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)
@@ -35,7 +51,7 @@
         onShow: function() {},
         onHide: function() {},
         computed: {
-            ...mapGetters(['news']),
+            ...mapGetters(['news', 'auth']),
             allUnread() {
                 return this.news.allUnread
             }
@@ -43,10 +59,41 @@
         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) {
+                if (!this.$api.haslogin()) {} else if (value > 0) {
                     uni.showTabBarRedDot({
                         index: 2
                     })
@@ -65,7 +112,7 @@
                         })
                     })
                 }
-            }
+            },
         }
     };
 </script>

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
+})

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/workList.vue

@@ -90,7 +90,8 @@
             near: {
                 type: Boolean,
                 default: false
-            }
+            },
+            position: Object,
         },
         data() {
             return {

components/sylj-selectLocation/tmap.vue

@@ -268,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,7 @@ module.exports = {
     apiKey: 'e4266a5e84fe6c10f60c559967f0a03f',
     // 显示标题
     showTitle: false,
+    loginURl: 'https://dy12333.org.cn/h5/#/pages/qyPackge/user/login/login',
     // 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 && !haslogin()) {
-    if (needLogin) {
+        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

@@ -65,11 +65,7 @@
     },
     "h5": {
         "sdkConfigs": {
-            "maps": {
+            "maps": {}
-                "qqmap": {
-                    "key": "FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI"
-                }
-            }
         },
         "template": "index.html",
         "router": {

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/index.vue

@@ -171,6 +171,9 @@
 </template>
 
 <script>
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     import {
         mapGetters
     } from 'vuex'
@@ -247,6 +250,10 @@
             }
         },
         onShow() {
+            if (!this.$api.haslogin()) {
+                GoLogin()
+                return
+            }
             this.getSkill()
         },
         created() {
@@ -529,6 +536,7 @@
                     }).then(res => {
                         this.isShowButton = false;
                         this.getResume()
+                        this.$store.dispatch('getResumeInfo')
                         this.$api.msg('保存成功')
                     })
                 } else {

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()
         },

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"
@@ -293,36 +293,21 @@
             };
         },
         onLoad: function(options) {
-
+            if (this.$api.haslogin()) {
+                this.$store.dispatch('getResumeInfo')
+            }
         },
         onShow: function() {
-            if (!this.$store.state.user.token) {
+            this.download()
-                uni.reLaunch({
+            this.getSwiperList()
-                    url: '/pages/login/login'
+            this.getPolicy()
-                })
+            if (this.$api.haslogin()) {
-                return
-            }
                 this.$store.dispatch('refreshAuthState').then((e) => {
                     var auth = this.$store.state.auth
                     if (!auth.bankCardState) {
                         this.step()
                     }
                 })
-
-            this.download()
-            this.getSwiperList()
-            this.getPolicy()
-            if (this.IsResume) {
-                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('请输入基本信息')
-                        })
-                    }
-                })
-                this.IsResume = false
             }
         },
         onReady() {
@@ -399,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 => {
@@ -412,25 +397,7 @@
                 };
             },
             goLocation: function() {
-                if (!this.$store.state.user.token) {
+                this.navTo('../mapSeach/mapSeach', true)
-                    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'
-                    });
-                }
             },
             goResume: function() {
                 uni.navigateTo({
@@ -444,40 +411,16 @@
                 });
             },
             goures: function() {
-                if (!this.$store.state.user.token) {
+                this.navTo('/pageMy/my/resume/index', true)
-                    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'
-                    });
-                }
             },
             toNewTask() {
-                uni.navigateTo({
+                this.navTo(`/pages/project/newProject?tabIndex=${0}`, false)
-                    url: `/pages/project/newProject?tabIndex=${0}`
-                });
             },
             toNewWork() {
-                uni.navigateTo({
+                this.navTo(`/pages/project/newProject?tabIndex=${1}`, false)
-                    url: `/pages/project/newProject?tabIndex=${1}`
-                });
             },
             toNewProject() {
-                uni.navigateTo({
+                this.navTo(`/pages/project/newProject?tabIndex=${2}`, false)
-                    url: `/pages/project/newProject?tabIndex=${2}`
-                });
             },
             toArticleDetail(id) {
                 if (id) {
@@ -487,49 +430,11 @@
                 }
             },
             gouserSet: function() {
-                if (!this.$store.state.user.token) {
+                this.navTo('/pageMy/setUserBase/index', true)
-                    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'
-                    });
-                }
             },
             goSeach: function() {
-                if (!this.$store.state.user.token) {
+                this.navTo('../seach/seach?keywords=' + this.keywords, true)
-                    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.keywords = ''
-                    // }
-                }
             },
             getSwiperList() {
                 getSwiperList(this.swiperType).then(res => {

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({
+                // uni.reLaunch({
-                    url: '/pages/login/login'
+                //     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

@@ -57,26 +57,26 @@
                 认证信息
                 <image src="../../static/img/right.svg" mode=""></image>
             </view>
-            <view class="btnList" @click="navTo('/pageMy/setUserBase/mailbox')">
+            <!-- <view class="btnList" @click="navTo('/pageMy/setUserBase/mailbox')">
                 <image src="../../static/img/evaluate.png" mode=""></image>
                 咨询信箱
                 <image src="../../static/img/right.svg" mode=""></image>
-            </view>
+            </view> -->
             <view class="btnList" @click="navTo('/pageMy/setUserBase/applicationsRecord')">
                 <image src="../../static/img/phone.svg" mode=""></image>
                 问卷调查
                 <image src="../../static/img/right.svg" mode=""></image>
             </view>
-            <view class="btnList" @click="navTo('/pageMy/setUserBase/survey')">
+            <!-- <view class="btnList" @click="navTo('/pageMy/setUserBase/survey')">
                 <image src="../../static/img/phone.svg" mode=""></image>
                 用工调研
                 <image src="../../static/img/right.svg" mode=""></image>
-            </view>
+            </view> -->
-            <view class="btnList" @click="navTo('/pageMy/setUserBase/complain')">
+            <!--   <view class="btnList" @click="navTo('/pageMy/setUserBase/complain')">
                 <image src="../../static/img/vip.svg" mode=""></image>
                 投诉建议
                 <image src="../../static/img/right.svg" mode=""></image>
-            </view>
+            </view> -->
             <template v-if="user.userIsCms">
                 <view class="btnList" @click="navTo('/pageMy/admin/check')">
                     <image src="../../static/img/check1.png" mode=""></image>
@@ -122,6 +122,9 @@
 </template>
 
 <script>
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
     import {
         mapState,
         mapGetters
@@ -140,20 +143,29 @@
             }
         },
         onLoad() {
-            this.$store.dispatch('getMobileIsCms')
+            // this.$store.dispatch('getMobileIsCms')
-            // if (this.$store.state.user.token && this.authPass) {
+            // if (this.$api.haslogin() && this.authPass) {
             // 	this.$store.dispatch('getVipCode')
             // }
         },
         onShow() {
-            if (!this.$store.state.user.token) {
+            if (/token/g.test(location.href)) {
-                uni.redirectTo({
+                this.$api.sleep(2000).then(() => {
-                    url: '/pages/login/login'
+                    if (!this.$api.haslogin()) {
-                })
+                        GoLogin()
                     } else {
                         uni.$emit('newsReadChange')
                         this.$store.dispatch('refreshAuthState')
                     }
+                })
+            } else {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                } else {
+                    uni.$emit('newsReadChange')
+                    this.$store.dispatch('refreshAuthState')
+                }
+            }
             // this.labourUnionInfoInit()
         },
         methods: {

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,21 @@
         },
         onLoad() {},
         onShow() {
-            if (!this.$store.state.user.token) {
+            if (/token/g.test(location.href)) {
-                uni.redirectTo({
+                this.$api.sleep(2000).then(() => {
-                    url: "/pages/login/login"
+                    if (!this.$api.haslogin()) {
-                })
+                        GoLogin()
                     } else {
                         uni.$emit('newsReadChange')
                     }
-            console.log(this.news)
+                })
+            } else {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                } else {
+                    uni.$emit('newsReadChange')
+                }
+            }
         },
         onPullDownRefresh() {
             this.loading = true

pages/project/map.vue

@@ -92,24 +92,18 @@
         },
         mounted() {
             const _this = this
-            uni.getLocation({
+            console.log(this.$store.state.user.userLocation)
-                type: 'gcj02',
+            if (this.$store.state.user.userLocation) {
-                success: function(res) {
                 const {
-                        longitude,
+                    latitude,
-                        latitude
+                    longitude
-                    } = res
+                } = this.$store.state.user.userLocation
-                    _this.latitude = latitude
-                    _this.longitude = longitude
                 _this.getList(longitude, latitude).then((covers) => {
                     _this.$refs.uMap.addFeature(covers)
                 })
-                },
+            } else {
-                fail: function(err) {
                 _this.$api.msg('无法获得周边信息')
-                },
+            }
-                complete: function(e) {}
-            })
         },
         onShow() {
             // const _this = this
@@ -144,25 +138,17 @@
             },
             search() {
                 const _this = this
-                uni.getLocation({
+                if (this.$store.state.user.userLocation) {
-                    type: 'gcj02',
-                    success: function(res) {
                     const {
-                            longitude,
+                        latitude,
-                            latitude
+                        longitude
-                        } = res
+                    } = this.$store.state.user.userLocation
-                        _this.latitude = latitude
-                        _this.longitude = longitude
                     _this.getList(longitude, latitude).then((covers) => {
-                            _this.$api.msg('成功获得周边信息')
                         _this.$refs.uMap.addFeature(covers)
                     })
-                    },
+                } else {
-                    fail: function(err) {
                     _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.$store.dispatch('getUserLocation')
-            this.getPolicy()
+            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) {
+            getNearList: function() {
-                nearMission(this.nearPage.current, this.nearPage.size).then(res => {
+                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.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.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;
+                    this.newPage.current = 1;
-                    console.log('123123')
+                    this.getNewList();
-                    this.getLocation();
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
                     }, 1000);
                     return
                 }
                 if (this.activeTab === '1') {
-                    this.recommendPage.current = 1;
+                    this.nearPage.current = 1;
-                    this.getRecommendList();
+                    this.getNearList();
                     setTimeout(function() {
                         uni.stopPullDownRefresh();
                     }, 1000);
                     return
                 }
                 if (this.activeTab === '2') {
-                    this.newPage.current = 1;
+                    // this.newPage.current = 1;
-                    this.getNewList();
+                    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

@@ -12,13 +12,16 @@
         </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)">{{
+                        :class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">
-				item
+                        {{item}}
-			}}</view>
                     </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()
+            this.$store.dispatch('getUserLocation')
-            console.log('userLocation', this.userLocation)
-            // this.getPolicy()
         },
         onShow: function() {
-            this.download();
+            if (/token/g.test(location.href)) {
-
+                this.$api.sleep(2000).then(() => {
-            if (this.$store.state.user.token) {
+                    this.showInit()
-                this.$store.dispatch('refreshAuthState').then((e) => {
-                    var auth = this.$store.state.auth
-                    if (!auth.bankCardState) {
-                        this.step()
-                    }
                 })
-            }
+            } else {
-
+                this.showInit()
-            const value = uni.getStorageSync('active');
-            if (value) {
-                this.activeTab = value;
-                uni.removeStorageSync('active')
             }
         },
         /*页面滚动到底部 换页*/
@@ -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) {
+                // if (!this.$api.haslogin()) {
-                    uni.redirectTo({
+                //     uni.redirectTo({
-                        url: "/pages/login/login"
+                //         url: "/pages/login/login"
-                    });
+                //     });
-                } else {
+                // } 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

@@ -123,7 +123,8 @@
                 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="{backgroundColor: applyopen ? '#999999' : '#1B66FF'}">
                 申请
             </view>
         </view>
@@ -162,9 +163,10 @@
             <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 }} :
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName || '联系人'}} :
-                    <span style="color: blue"
+                    <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>
@@ -251,7 +253,8 @@
                 maxlength: 6,
                 collectStatus: 0, // 收藏状态
                 showPopUp: false,
-                isInvite: false
+                isInvite: false,
+                applyopen: false
             }
         },
         components: {
@@ -291,6 +294,14 @@
         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 => {
@@ -300,6 +311,14 @@
                 })
             },
             callPhone() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
                 this.showPopUp = true;
             },
             closePopUp() {
@@ -343,7 +362,9 @@
                             lon: self.info.lon,
                         })
                     }
-
+                    if (res.data.data.missionNo.search('ZKRD') >= 0) {
+                        self.applyopen = true
+                    }
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {
@@ -357,16 +378,23 @@
                 });
             },
             submit: function() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
+
+                if (this.applyopen) return;
                 const _that = this
                 uni.showModal({
                     title: '提示',
                     content: '请确认申请，申请后不能撤销',
                     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
@@ -572,11 +600,11 @@
         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 {

pages/projectInfo/userrecruitInfo.vue

@@ -166,9 +166,10 @@
             <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 }} :
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName || '联系人'}} :
-                    <span style="color: blue"
+                    <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>
@@ -295,6 +296,14 @@
         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 => {
@@ -304,6 +313,15 @@
                 })
             },
             callPhone() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
                 this.showPopUp = true;
             },
             closePopUp() {
@@ -356,16 +374,21 @@
                 }
             },
             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) {
                         if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
                             if (_that.loading) return
                             const auth = _that.auth
                             const contractOn = _that.info.contractOn

pages/projectInfo/userrecruitWorkInfo.vue

@@ -170,9 +170,10 @@
             <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 }} :
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName || '联系人'}} :
-                    <span style="color: blue"
+                    <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>
@@ -297,6 +298,14 @@
         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 => {
@@ -306,6 +315,15 @@
                 })
             },
             callPhone() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
                 this.showPopUp = true;
             },
             closePopUp() {
@@ -357,16 +375,21 @@
                 }
             },
             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) {
                         if (res.confirm) {
-                            if (!_that.$store.state.user.token) {
-                                GoLogin()
-                                return
-                            }
                             if (_that.loading) return
                             const auth = _that.auth
                             const contractOn = _that.info.contractOn

pages/projectInfo/workInfo.vue

@@ -127,7 +127,8 @@
                 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="{backgroundColor: applyopen ? '#999999' : '#1B66FF'}">
                 申请
             </view>
         </view>
@@ -166,9 +167,10 @@
             <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 }} :
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName || '联系人  '}} :
-                    <span style="color: blue"
+                    <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>
@@ -251,6 +253,7 @@
                 maxlength: 6,
                 collectStatus: 0, // 收藏状态
                 showPopUp: false,
+                applyopen: false
             }
         },
         components: {
@@ -288,6 +291,14 @@
         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 => {
@@ -297,6 +308,15 @@
                 })
             },
             callPhone() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
                 this.showPopUp = true;
             },
             closePopUp() {
@@ -304,6 +324,7 @@
             },
             // 获取收藏状态
             getCollectStatus() {
+                if (!this.$api.haslogin()) return
                 getCollectState(this.info.id, 1).then(res => {
                     // 0 未收藏，1 已收藏
                     // console.log(res)
@@ -326,6 +347,9 @@
                             lon: self.info.lon,
                         })
                     }
+                    if (res.data.data.missionNo.search('ZKRD') >= 0) {
+                        self.applyopen = true
+                    }
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {
@@ -339,16 +363,22 @@
                 });
             },
             submit: function() {
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                    return
+                }
+
+                if (!this.$api.hasResume()) {
+                    this.navTo('/pageMy/my/resume/index', true)
+                    return
+                }
+                if (this.applyopen) return;
                 const _that = this
                 uni.showModal({
                     title: '提示',
                     content: '请确认申请，申请后不能撤销',
                     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
@@ -554,11 +584,11 @@
         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 {

pages/recruit/subPage/MessageList.vue

@@ -30,7 +30,10 @@ import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
     import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
 
     export default {
-	components: { CustomTabbar, CustomNavbar },
+        components: {
+            CustomTabbar,
+            CustomNavbar
+        },
         data() {
             return {
                 loading: false,
@@ -162,7 +165,7 @@ export default {
         },
         onLoad() {},
         onShow() {
-		if (!this.$store.state.user.token) {
+            if (!this.$api.haslogin()) {
                 uni.redirectTo({
                     url: "/pages/login/login"
                 })
@@ -212,7 +215,9 @@ export default {
                 }
             },
             back() {
-			uni.reLaunch({ url: '/pages/my/my' })
+                uni.reLaunch({
+                    url: '/pages/my/my'
+                })
             },
         },
     }

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-history">
-            <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="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"
+        <block v-if="activeTab === 0">
-            color="#999" activeColor="#000" fontSize="30rpx" activeFontSize="31rpx" @change='changeTab' />
+            <view v-if="companyList.length ">
-
-
-        <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>
+                    <companyList :companyitem="item" :location="userLocation"></companyList>
                 </block>
             </view>
             <view v-else>
@@ -78,10 +41,10 @@
                 </view>
             </view>
         </block>
-        <block v-if="(activeTab == 1)&&!searchResultShow">
+        <block v-if="activeTab === 1">
-            <view v-if="newList.length > 0">
+            <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">
+        <block v-if="activeTab == 2">
-            <view v-if="recommendList.length > 0">
+            <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-if="activeTab == -1">
-			<block v-for="(item, index) in companyList" :key="item.id">
+            <view>
-				<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>
+        </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,
+                companyList: [],
-                searchResultList: []
+                newList: [],
-            };
+                recommendList: [],
+                tabList: ['零工岗位', '全职岗位', '政策']
+            }
         },
-        onLoad: function(option) {
+        computed: {
-            this.keywords = option.keywords ? option.keywords : ''
+            ...mapGetters(['userLocation']),
         },
         onShow: function() {
-            this.getList('refresh');
             this.getKeyWordsList()
         },
-        /*页面滚动到底部*/
-        onReachBottom: function() {
-            this.upLoad()
-        },
         methods: {
-            clearCurrentKeyWords() {
+            goPolicyInfo(data) {
-                this.keywords = '';
+                if (data) {
-                let that = this;
+                    uni.navigateTo({
-                setTimeout(function() {
+                        url: `/pages/user/policyContent?id=${data}`
-                    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() {
@@ -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
                 }
-        }
+                let resData = await userWorkSearchListAll(params)
-    };
+                if (resData.data.code === 200) {
-</script>
+                    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>

store/models/news.js

@@ -372,7 +372,7 @@ const news = {
             current,
             total
         }) => {
-            console.log(data)
+            if (!data) return
             data.forEach(item => {
                 state.dic[item.id] = item
             })

store/models/user.js

@@ -18,6 +18,9 @@ import {
 import {
     calcDate
 } from '@/untils/date.js'
+import {
+    myResume,
+} from '@/api/resume.js';
 
 let refreshTimer = null;
 
@@ -67,8 +70,18 @@ const user = {
         }) || 0, // 0 个体招工 ； 企业招工
         userLocation: null,
         userIsCms: false,
+        resumeInfo: {},
     },
     actions: {
+        getResumeInfo({
+            commit,
+            dispatch
+        }) {
+            myResume().then(res => {
+                const data = res.data.data
+                commit('upDataResumeInfo', data)
+            })
+        },
         getMobileIsCms({
             commit,
             dispatch
@@ -83,14 +96,14 @@ const user = {
             commit,
             dispatch
         }) {
-            console.log('getUserLocation null1')
             // commit('setLocation', {
             //     latitude: 31.133980,
             //     longitude: 104.404419,
             // })
             uni.getLocation({
-                type: 'gcj02',
+                type: 'wgs84',
                 success: function(res) {
+                    console.warn('用户位置获取成功')
                     const {
                         longitude,
                         latitude
@@ -101,9 +114,12 @@ const user = {
                     })
                 },
                 fail: function(err) {
+                    console.warn('用户位置获取失败')
                     commit('setLocation', null)
                 },
-                complete: function(e) {}
+                complete: function(e) {
+                    console.warn('getUserLocation' + JSON.stringify(e))
+                }
             })
         },
         //用户点击radio按钮
@@ -223,9 +239,12 @@ const user = {
             commit
         }, data) {
             commit('SET_USER_SENDTIMES', data);
-        },
+        }
     },
     mutations: {
+        upDataResumeInfo(state, payload) {
+            state.resumeInfo = payload
+        },
         setIsCms(state, payload) {
             state.userIsCms = payload.val
         },

untils/AxiosUtils.js

@@ -17,8 +17,10 @@ import {
 import {
     replaceStr
 } from "../config";
+import overAllConfig from "../config";
 
 let showModal = true
+const tabbarPageName = ['/pages/project/project', '/pages/my/my', '/pages/news/news']
 /**
  *
  * @export
@@ -109,9 +111,9 @@ async function DoAjax(options, config = {}) {
     if (statusWhiteList.includes(status)) throw res;
     //如果是401则跳转到登录页面
     if (status === 401) {
-        store.dispatch('FedLogOut').then(() => {
+        // store.dispatch('FedLogOut').then(() => {
-            GoLogin()
+        //     GoLogin()
-        });
+        // });
         throw new Error(message);
     }
     // 如果请求为非200否者默认统一处理
@@ -189,25 +191,33 @@ export function Promisify(func) {
 
 export function GoLogin() {
     if (showModal) {
-        showModal = false
+        uni.showModal({
-        location.href = "https://dy12333.org.cn/h5/"
+            title: "提示",
-        // uni.showModal({
+            content: "您还未登录，点击确认去登录",
-        // 	title: "提示",
+            success({
-        // 	content: "您还未登录，点击确认去登录",
+                confirm,
-        // 	success({
+                cancel
-        // 		confirm
+            }) {
-        // 	}) {
+                if (confirm) {
-        // 		if (confirm) {
+                    const returnPage = `${overAllConfig.loginURl}?returnPage=${location.href}`
-        // 			uni.redirectTo({
+                    location.href = returnPage
-        // 				url: "/pages/login/login"
+                }
-        // 			});
+                if (cancel) {
-        // 		}
+                    let pages = getCurrentPages();
-        // 		showModal = true
+                    let prePage = pages[pages.length - 1];
-        // 	},
+                    const resetPage = tabbarPageName.find((item) => item === prePage.$route.fullPath)
-        // 	fail() {
+                    if (resetPage) {
-        // 		showModal = true
+                        uni.switchTab({
-        // 	}
+                            url: '/pages/index/index'
-        // })
+                        })
+                    }
+                }
+            },
+            complete() {
+                showModal = true
+            }
+
+        })
     }
 }
 

vue.config.js

@@ -7,6 +7,7 @@ module.exports = {
         proxy: {
             '/api': {
                 target: 'http://10.165.0.173:8000',
+                // target: 'http://192.168.1.115:8000',
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'