diff --git a/common/api.js b/common/api.js index 9985a44..9ee5591 100644 --- a/common/api.js +++ b/common/api.js @@ -115,3 +115,8 @@ export const getAuthenticationPerson = (params) => http.get('/employ-api/employ/ // 首页-分类信息列表 export const queryCategoryList = (params) => http.get('/employ-api/employ/category/queryCategoryList', params) + +// 我的钱包-累计提现 +export const CountCashOut = (params) => http.get('/employ-api/employ/amount/CountCashOut', params) +// 我的钱包-我的余额 +export const queryBalance = (params) => http.get('/employ-api/employ/amount/queryBalance', params) diff --git a/pages/home/component/enterprise.vue b/pages/home/component/enterprise.vue index de667fd..0a34b55 100644 --- a/pages/home/component/enterprise.vue +++ b/pages/home/component/enterprise.vue @@ -60,10 +60,10 @@ {{items.createTime}} - + {{items.categoryTwo_dictText}} - + {{items.address}} diff --git a/pages/home/index.vue b/pages/home/index.vue index d0e1dd8..9e5981d 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -23,13 +23,15 @@ + - - + + {{item.name}} - + + 招聘 @@ -40,6 +42,7 @@ + @@ -86,12 +90,11 @@ }, data(){ return { + latitude:'', + longitude:'', + notList:[], notice:[], - status:1, - list: [ - "https://cdn.uviewui.com/uview/swiper/swiper1.png" - ], tabList:[],//导航栏 swiperList:[],//轮播 current:0, @@ -107,8 +110,6 @@ rpageSize:20, rlist:[], - latitude:'34.00', - longitude:'134.65', tpageNo:1, tpageSize:20, tList:[] @@ -128,17 +129,29 @@ }, onPullDownRefresh() { let that = this - that.rpageNo = 1 - that.rlist = [] - that.onRolelist() + if(that.current==0){ + that.rpageNo = 1 + that.rlist = [] + that.onRolelist() + }else if(that.current==1){ + that.tpageNo = 1 + that.tList = [] + that.onTaskList() + } + }, onReachBottom() { let that = this - that.rpageNo = that.rpageNo + 1 - that.onRolelist() + if(that.current==0){ + that.rpageNo = that.rpageNo + 1 + that.onRolelist() + }else if(that.current==1){ + that.tpageNo = that.tpageNo + 1 + that.onTaskList() + } + }, methods:{ - onNoticeDetail(index){ console.info(index) uni.navigateTo({ @@ -172,13 +185,11 @@ }, getLocation(){ const that = this; - console.log('当前位置的经度:'); wx.getLocation({ type: 'wgs84', success: function (res) { - console.log('位置',res); - console.log('当前位置的经度:' + res.longitude); - console.log('当前位置的纬度:' + res.latitude); + that.latitude=res.latitude + that.longitude=res.longitude uni.setStorageSync("longitude",res.longitude) uni.setStorageSync("latitude",res.latitude) const qqmapsdk = new QQMapWX({ @@ -216,17 +227,18 @@ }) }, onTaskList(){ + let that = this taskList({ - latitude:this.latitude, - longitude:this.longitude, - pageNo:this.tpageNo, - pageSize:this.tpageSize + latitude:that.latitude, + longitude:that.longitude, + pageNo:that.tpageNo, + pageSize:that.tpageSize }).then(response=>{ console.info("response",response.result.records) - if(this.tpageNo==1){ - this.tList = response.result.records + if(that.tpageNo==1){ + that.tList = response.result.records }else{ - this.tList = this.tList.concat(response.result.records) + that.tList = that.tList.concat(response.result.records) } console.info("taskList",response) }).catch(error=>{ @@ -234,15 +246,16 @@ }) }, onRolelist(){ + let that = this querySeekList({ - pageNo:this.rpageNo, - pageSize:this.rpageSize + pageNo:that.rpageNo, + pageSize:that.rpageSize }).then(response=>{ - console.info("response",response) - if(this.rpageNo==1){ - this.rlist = response.result.records + console.info("querySeekList",response) + if(that.rpageNo==1){ + that.rlist = response.result.records }else{ - this.rlist = this.rlist.concat(response.result.records) + that.rlist = that.rlist.concat(response.result.records) } }).catch(error=>{ @@ -258,6 +271,7 @@ console.info(event) }, toNavigator(event){ + console.info(event) uni.navigateTo({ url:"/pages_subpack/release/index?status="+event }) diff --git a/pages/login/index.vue b/pages/login/index.vue index fca55b3..50f5de3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -40,7 +40,7 @@ diff --git a/pages_subpack/person/index.vue b/pages_subpack/person/index.vue index 121c253..999b54c 100644 --- a/pages_subpack/person/index.vue +++ b/pages_subpack/person/index.vue @@ -1,6 +1,9 @@