1263428893@qq.com 3 months ago
parent
commit
b1a7bafcba
6 changed files with 117 additions and 22 deletions
  1. +2
    -2
      common/config.js
  2. +5
    -2
      pages/home/component/enterprise.vue
  3. +66
    -6
      pages/home/component/master.vue
  4. +5
    -2
      pages/home/index.vue
  5. +30
    -1
      pages_subpack/work-detail/index.vue
  6. +9
    -9
      util/request/responseInterceptors.js

+ 2
- 2
common/config.js View File

@ -1,7 +1,7 @@
module.exports = {
// baseUrl: 'http://3fl8266127.qicp.vip'
// baseUrl:"https://employadmin.hhlm1688.com"
baseUrl:"http://augcl.natapp1.cc", //测试环境
baseUrl:"https://employadmin.hhlm1688.com"
// baseUrl:"http://augcl.natapp1.cc", //测试环境
// https://employadmin.hhlm1688.com/employ-api
}

+ 5
- 2
pages/home/component/enterprise.vue View File

@ -46,7 +46,7 @@
<text class="se-fs-24 se-c-text-third">{{items.sex_dictText}}-汉族</text>
</view>
<view class="se-flex se-flex-h-c">
<view class="se-py-10 se-px-20 se-br-12 se-fs-22 se-c-orange se-bgc-ffd se-ml-20 se-fw-6" >
<view class="se-py-10 se-px-20 se-br-12 se-fs-22 se-c-orange se-bgc-ffd se-ml-20 se-fw-6 se-toe-1" style="max-width: 100rpx;">
{{items.categoryTwo_dictText}}
</view>
</view>
@ -59,7 +59,10 @@
<text class="se-c-text-third se-fs-22 se-mt-10">09月23日 16:20</text>
</view> -->
<view class="se-flex se-flex-h-sb">
<text class="se-c-text-sub se-fs-24">{{items.brief}}</text>
<text class="se-c-text-sub se-fs-24 se-toe-5">
{{items.brief}}
<!-- <u-parse v-if="items.brief" :content="items.brief"></u-parse> -->
</text>
<view @click.capture="onCustomerService(items.phone)" class="se-flex se-flex-h-c se-py-10 se-px-20 se-br-12 se-fs-22 se-c-orange se-bgc-ffd se-fw-6">
<u-icon color="#FF7A31" name="phone-fill"></u-icon>
<text class="se-ml-5">联系他</text>


+ 66
- 6
pages/home/component/master.vue View File

@ -49,14 +49,14 @@
<!-- <text class="se-c-text-sub se-fs-22 se-mr-10 se-py-5 se-px-20 se-br-5 se-bgc-f5">水泥搬运</text> -->
</view>
<view class="se-flex se-flex-h-sb">
<view class="se-flex">
<u-icon class="se-ml-10" name="map"></u-icon>
<!-- <text class="se-c-text-sub se-fs-24 se-pr-10">{{items.distances}}km</text> -->
<text class="se-c-text-sub se-fs-24 se-pr-10">100km</text>
<text class="se-c-text-sub se-fs-24 se-pl-10 se-b-l">{{items.address}}</text>
<view class="se-flex se-flex-h-c">
<u-icon name="map"></u-icon>
<text class="se-c-text-sub se-fs-24 se-pr-10">{{items.latitude,items.longitude | getDistance}}km</text>
<!-- <text class="se-c-text-sub se-fs-24 se-pr-10">100km</text> -->
<text class="se-c-text-sub se-fs-24 se-pl-10 se-b-l se-toe-3" style="max-width: 220rpx;">{{items.address}}</text>
</view>
<view class="se-c-text se-c-text-sub se-fs-24">
{{items.createTime}}
{{items.createTime | formatTime}}
</view>
<view class="se-flex se-flex-h-c se-py-10 se-px-20 se-br-12 se-fs-22 se-c-orange se-bgc-ffd se-fw-6">
<text class="se-ml-5">立即接单</text>
@ -102,6 +102,66 @@
defaultIndex:[0,0]
}
},
filters:{
formatTime(time) {
const timestamp = new Date(time).getTime();
const currentTime = new Date().getTime();
console.info("currentTime",currentTime)
const diff = (currentTime - timestamp) / 1000; //
//
const oneMonthInSeconds = 30 * 24 * 60 * 60;
if (diff > oneMonthInSeconds) {
let date = new Date(timestamp);
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
if (month < 10) month = "0" + month;
if (day < 10) day = "0" + day;
return `${year}-${month}-${day}`;
} else {
//
if (diff < 60) {
return `${Math.floor(diff)}秒钟前`;
} else if (diff < 60 * 60) {
return `${Math.floor(diff / 60)}分钟前`;
} else if (diff < 60 * 60 * 24) {
return `${Math.floor(diff / 60 / 60)}小时前`;
} else {
//
return `${Math.floor(diff / 60 / 60 / 24)}天前`;
}
}
},
formDate(date){
return dayjs(date).format("YYYY-MM-DD").fromNow();
},
getDistance(lat1, lng1) {
let lng2 = uni.getStorageSync("longitude")
let lat2 = uni.getStorageSync("latitude")
if(!lng2 && !lat2){
return "请授权"
}
const R = 6371; // km
const radLat1 = (lat1 * Math.PI) / 180;
const radLat2 = (lat2 * Math.PI) / 180;
const deltaLat = radLat2 - radLat1;
const deltaLng = ((lng2 - lng1) * Math.PI) / 180;
const a =
Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) +
Math.cos(radLat1) *
Math.cos(radLat2) *
Math.sin(deltaLng / 2) *
Math.sin(deltaLng / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
return (R * c).toFixed(2); //
}
},
methods:{
onSelected(res){
console.info(res)


+ 5
- 2
pages/home/index.vue View File

@ -114,6 +114,9 @@
}
},
mounted() {
},
onShow() {
this.onBannerList()
this.onTaskList()
this.onRolelist()
@ -177,7 +180,7 @@
uni.setStorageSync("longitude",res.longitude)
uni.setStorageSync("latitude",res.latitude)
const qqmapsdk = new QQMapWX({
key: 'TT7BZ-Z3LW4-KOAUB-KWHOA-SBJJ6-Y5B6R' //
key: 'BJKBZ-W46K3-6S43C-OFLJB-FW6FQ-RMBYP' //
});
qqmapsdk.reverseGeocoder({
location: {
@ -217,12 +220,12 @@
pageNo:this.tpageNo,
pageSize:this.tpageSize
}).then(response=>{
console.info("response",response.result.records)
if(this.tpageNo==1){
this.tList = response.result.records
}else{
this.tList = this.tList.concat(response.result.records)
}
console.info("taskList",response)
}).catch(error=>{


+ 30
- 1
pages_subpack/work-detail/index.vue View File

@ -30,7 +30,7 @@
<view class="se-fs-36 se-c-black">
工作地址
</view>
<view class="se-fs-24 se-c-66 se-pt-10 se-flex se-flex-h">
<view class="se-fs-24 se-c-66 se-pt-10 se-flex se-flex-h" @click="openAddress()">
<text>{{items.address}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
@ -94,6 +94,35 @@
}).catch(error=>{
})
},
openAddress(){
let that = this
// wx.openLocation({
// latitude: that.items.latitude.toFixed(2),
// longitude: that.items.longitude.toFixed(2),
// name: that.items.title,
// address: that.items.address,
// scale: 12,
// success: function(res) {
// console.log(JSON.stringify(res));
// },
// fail: function(res) {
// console.log(`openLocation fail:${JSON.stringify(res)}`);
// }
// })
uni.openLocation({
latitude: 30.492121,
longitude: 114.410324,
name: "保利国际中心",
address: "武汉市洪山区关山大道",
scale: 12,
success: function(res) {
console.log(JSON.stringify(res));
},
fail: function(res) {
console.log(`openLocation fail:${JSON.stringify(res)}`);
}
})
}
}
}


+ 9
- 9
util/request/responseInterceptors.js View File

@ -42,14 +42,14 @@ module.exports = (vm) => {
}, (response) => {
const data = response.data
console.info('responseresponse',data)
// if(data.code === 401){
// uni.removeStorageSync('token')
// uni.removeStorageSync('userInfo')
// uni.navigateTo({
// url:"/pages/auth/index"
// })
// return;
// }
// return Promise.reject(response)
if(data.code === 401){
uni.removeStorageSync('token')
uni.removeStorageSync('userInfo')
uni.navigateTo({
url:"/pages/auth/index"
})
return;
}
return Promise.reject(response)
})
}

Loading…
Cancel
Save