From 3a5b9dd6cd33328d22222d2655160bd86a955102 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Thu, 25 Apr 2024 11:42:21 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=20=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/map.js                |   8 +-
 pages.json                |   9 +
 pages/project/map.vue     | 434 ++++++++++++++++++++++++++++++++++++++
 pages/project/project.vue |   7 +-
 static/img/direction.png  | Bin 0 -> 531 bytes
 static/img/direction2.png | Bin 0 -> 565 bytes
 static/img/gwpoint.png    | Bin 0 -> 1389 bytes
 static/img/mypoint.png    | Bin 0 -> 1138 bytes
 static/img/taskpoint.png  | Bin 0 -> 1389 bytes
 untils/tools.js           |  35 ++-
 10 files changed, 487 insertions(+), 6 deletions(-)
 create mode 100644 pages/project/map.vue
 create mode 100644 static/img/direction.png
 create mode 100644 static/img/direction2.png
 create mode 100644 static/img/gwpoint.png
 create mode 100644 static/img/mypoint.png
 create mode 100644 static/img/taskpoint.png

diff --git a/api/map.js b/api/map.js
index 25db316..d312e50 100644
--- a/api/map.js
+++ b/api/map.js
@@ -59,4 +59,10 @@ export const querySearch = (keyword, key) => {
                 reject(err)
             })
     })
-}
\ No newline at end of file
+}
+
+export const geQueryJobsByNearby = (params) => request({
+    url: '/api/jobslink-api/nearby/job/queryJobsByNearby',
+    method: 'get',
+    params
+});
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 11e5f77..95e07f3 100644
--- a/pages.json
+++ b/pages.json
@@ -398,6 +398,15 @@
                 "navigationBarBackgroundColor": "#FFFFFF",
                 "enablePullDownRefresh": false
             }
+        },
+        {
+            "path": "pages/project/map",
+            "style": {
+                "backgroundTextStyle": "dark",
+                "navigationBarTextStyle": "black",
+                "enablePullDownRefresh": true,
+                "navigationStyle": "custom"
+            }
         }
     ],
     "subPackages": [{
diff --git a/pages/project/map.vue b/pages/project/map.vue
new file mode 100644
index 0000000..fdba1ef
--- /dev/null
+++ b/pages/project/map.vue
@@ -0,0 +1,434 @@
+<template>
+    <view class="app_container">
+        <view class="app-top">
+            <view class="top-search">
+                <view class="top-input">
+                    <input class="put" type="text" placeholder-class="put-pla" v-model="searchValue"
+                        placeholder="搜索地点或者附近的任务及岗位">
+                    <button class="input-btn" @tap="search">搜索</button>
+                </view>
+            </view>
+        </view>
+        <view class="view-map">
+            <map style="width: 100%;height: 100%;" scale="16" :latitude="latitude" :longitude="longitude"
+                :markers="covers" @markertap="clickmark" @regionchange="show = false"></map>
+            <view class="position-bottom" v-if="show">
+                <view class="uni-margin-wrap">
+                    <swiper class="swiper" circular :interval="2000" :duration="500">
+                        <swiper-item class="wiperItem">
+                            <view class="swiper-item uni-bg-red">
+                                <view class="item-content">
+                                    <view class="content-title"> {{productInfo.missionTitle}} </view>
+                                    <view class="color_999999 fs_12 mar_top5">
+                                        <uni-icons type="location" color="#999999" size="12"></uni-icons>
+                                        {{ productInfo.cityId }} ｜ {{productInfo.address}} ｜ 距离：{{distance}}
+                                    </view>
+                                    <view class="color_999999 fs_12 mar_top5">
+                                        <uni-icons type="map-pin-ellipse" color="#999999" size="12"></uni-icons>
+                                        招聘时间: {{productInfo.stime}}-{{productInfo.etime}}
+                                    </view>
+                                    <view class="color_999999 fs_12 mar_top5">
+                                        <uni-icons type="map-pin-ellipse" color="#999999" size="12"></uni-icons>
+                                        {{productInfo.experienceDesc}} | {{education[productInfo.education]}}
+                                    </view>
+                                    <button class="btns" hover-class="active" @tap="openMap">
+                                        <image class="btn-img" src="../../static/img/direction2.png" />查看详情
+                                    </button>
+                                </view>
+                            </view>
+                        </swiper-item>
+                    </swiper>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        addZeroPrefix,
+        getDistanceFromLatLonInKm
+    } from '@/untils/tools.js'
+    import testData from '@/common/textdata.js';
+    import {
+        geQueryJobsByNearby
+    } from '@/api/map.js'
+    let taskpoint = require('../../static/img/taskpoint.png');
+    let gwpoint = require('../../static/img/gwpoint.png');
+    let mypoint = require('../../static/img/mypoint.png');
+    export default {
+        data() {
+            return {
+                education: testData.education,
+                show: false,
+                ID: 1,
+                searchValue: '',
+                latitude: 31.133980,
+                longitude: 104.404419,
+                covers: [],
+                rateValue: 2,
+                productInfo: {},
+
+            };
+        },
+        computed: {
+            distance() {
+                const {
+                    lon,
+                    lat
+                } = this.productInfo
+                if (lon) {
+                    const {
+                        m,
+                        km
+                    } = getDistanceFromLatLonInKm(lat, lon, this.latitude, this.longitude)
+                    return m > 1000 ? `${km.toFixed(2)}km` : `${m.toFixed(2)}m`
+                }
+                return '无'
+            }
+        },
+        onShow() {
+            const _this = this
+            // uni.getLocation({
+            //     type: 'gcj02',
+            //     success: function(res) {
+            //         const {
+            //             longitude,
+            //             latitude
+            //         } = res
+            //         _this.$api.msg('成功获得周边信息')
+            //         console.log('成功获得周边信息', res)
+            //         _this.latitude = latitude
+            //         _this.longitude = longitude
+            //         _this.$api.msg('获得周边信息')
+            //         _this.getList(lon, lat).then((covers) => {
+            //             _this.covers = covers
+            //         })
+            //     },
+            //     fail: function(err) {
+            //         _this.$api.msg('无法获得周边信息')
+            //     },
+            //     complete: function(e) {}
+            // })
+            this.mockGetLocation().then((myPoint) => {
+                // this.latitude = myPoint.latitude
+                // this.longitude = myPoint.longitude
+                _this.getList(_this.longitude, _this.latitude).then((covers) => {
+                    _this.$api.msg('成功获得周边信息')
+                    _this.covers = covers
+                })
+            })
+        },
+        methods: {
+            openMap(lon, lat) {
+                //打开地图，并将门店位置传入
+                // type: post 岗位 mission 任务
+                switch (this.productInfo.type) {
+                    case 'post':
+                        const no = encodeURIComponent(1)
+                        uni.navigateTo({
+                            url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=${1}`
+                        })
+                        break
+                    case 'mission':
+                        const no1 = encodeURIComponent(this.productInfo.missionNo)
+                        uni.navigateTo({
+                            url: `/pages/projectInfo/projectInfo?missionNo=${no1}&isCan=${1}`
+                        })
+                        break
+                }
+            },
+            search() {
+                this.getList(this.longitude, this.longitude).then((covers) => {
+                    this.covers = covers
+                })
+            },
+            clickmark(e) {
+                if (e.detail.markerId === 1) return
+                this.show = true;
+                for (var i = 0; i < this.covers.length; i++) {
+                    //遍历集合找出对应的maekerid的数据
+                    if (this.covers[i].id == e.detail.markerId) {
+                        this.productInfo = this.covers[i].info
+                        break;
+                    }
+                }
+            },
+            mockGetLocation() {
+                return new Promise((resolve) => {
+                    resolve({
+                        "longitude": 104.40632,
+                        "latitude": 31.122989,
+                        "altitude": null,
+                        "accuracy": 25.998,
+                        "altitudeAccuracy": null,
+                        "heading": null,
+                        "speed": null,
+                        "errMsg": "getLocation:ok",
+                        "verticalAccuracy": 0,
+                        "horizontalAccuracy": 25.998
+                    })
+                })
+            },
+            async getList(lon, lat) {
+                return new Promise(async (resolve) => {
+                    let params = {
+                        lon,
+                        lat,
+                        distanceRange: 20,
+                        taskTitle: this.searchValue
+                    }
+                    // let json = [{
+                    //     "id": "1783015444661387266",
+                    //     "createUser": "242452735",
+                    //     "createDept": "171612561",
+                    //     "createTime": "2024-04-24 14:09:43",
+                    //     "updateUser": "242452735",
+                    //     "updateTime": "2024-04-24 14:09:43",
+                    //     "status": 1,
+                    //     "isDeleted": 0,
+                    //     "missionTitle": "维修人员",
+                    //     "skillNames": "市场/品牌推广",
+                    //     "companyIndustry": "家政",
+                    //     "tradeId": "1754327500065390599",
+                    //     "tradeNames": "制造业",
+                    //     "wage": "3",
+                    //     "wageUnitCategory": 2,
+                    //     "lat": 31.131007394902717,
+                    //     "lon": 104.40944639490272,
+                    //     "type": "post",
+                    //     "address": "广告法规定发给对方的反感",
+                    //     "cityId": "北京-北京市-东城区 ",
+                    //     "missionDesc": "范德萨发大水发发的发的发的方法是否是对方感受感受地方噶 好好放个假非户籍",
+                    //     "stime": "2024-04-25 00:00:00",
+                    //     "etime": "2024-04-26 00:00:00",
+                    //     "etimePub": "",
+                    //     "education": 7,
+                    //     "experienceDesc": "不限经验",
+                    //     "callName": "叶婷婷",
+                    //     "callTel": "15196372910"
+                    // }]
+                    // const arr = json.map((item) => ({
+                    //     id: item.id,
+                    //     longitude: item.lon,
+                    //     latitude: item.lat,
+                    //     iconPath: item.type === 'post' ? gwpoint : taskpoint,
+                    //     width: 20,
+                    //     height: 20,
+                    //     callout: {
+                    //         content: item.missionTitle,
+                    //         fontSize: 10,
+                    //         borderColor: 'blue',
+                    //     },
+                    //     info: item
+                    // }))
+                    // arr.push({
+                    //     id: 1,
+                    //     latitude: lat,
+                    //     longitude: lon,
+                    //     iconPath: mypoint,
+                    //     width: 20,
+                    //     height: 20
+                    // })
+                    // resolve(arr)
+                    let resData = await geQueryJobsByNearby(params)
+                    if (resData.data.code === 200) {
+                        const arr = resData.data.data.map((item) => ({
+                            id: item.id,
+                            longitude: item.lon,
+                            latitude: item.lat,
+                            iconPath: item.type === 'post' ? gwpoint : taskpoint,
+                            width: 20,
+                            height: 20,
+                            callout: {
+                                content: item.missionTitle,
+                                fontSize: 10,
+                                borderColor: 'blue',
+                            },
+                            info: item
+                        }))
+                        arr.push({
+                            id: 1,
+                            latitude: lat,
+                            longitude: lon,
+                            iconPath: mypoint,
+                            width: 20,
+                            height: 20
+                        })
+                        resolve(arr)
+                    }
+
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .color_999999 {
+        color: #999999;
+    }
+
+    .fs_12 {
+        font-size: 24rpx;
+    }
+
+    .mar_top5 {
+        margin-top: 10rpx;
+    }
+
+    .active {
+        background: #EAEAEA !important;
+        color: #AFAFAF;
+    }
+
+    .card_mark {
+        .mark_l {
+            width: 56rpx;
+            height: 28rpx;
+            border-radius: 12rpx 0 12rpx 12rpx;
+            background: linear-gradient(157deg, #A043C1 0%, #4133A2 100%);
+            font-size: 28rpx;
+            font-family: PingFang-SC-Bold, PingFang-SC;
+            font-weight: bold;
+            color: #FFFFFF;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .position-bottom {
+        position: absolute;
+        left: 0;
+        right: 0;
+        height: 406rpx;
+        bottom: 50rpx;
+
+        .uni-margin-wrap {
+            height: 406rpx;
+
+            .swiper {
+                height: 406rpx;
+
+                .wiperItem {
+                    padding-left: 50rpx;
+                    height: 406rpx;
+                    width: 660rpx !important;
+
+                    .swiper-item {
+                        width: 660rpx;
+                        height: 406rpx;
+                        background: #FFFFFF;
+                        box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
+                        border-radius: 27rpx;
+                        overflow: hidden;
+
+                        .item-top {
+                            display: flex;
+                            align-content: center;
+                            justify-content: space-between;
+
+                            .top-img {
+                                width: 215rpx;
+                                height: 120rpx;
+                            }
+                        }
+
+                        .item-content {
+                            padding: 15rpx 33rpx;
+
+                            .content-title {
+                                font-size: 32rpx;
+                            }
+
+                            .btns {
+                                margin-top: 20rpx;
+                                display: flex;
+                                align-items: center;
+                                justify-content: center;
+                                width: 223rpx;
+                                height: 64rpx;
+                                background: linear-gradient(to right, #A043C1 0%, #4133A2 100%);
+                                border-radius: 15rpx;
+                                color: #FFFFFF;
+                                font-size: 26rpx;
+                                font-weight: 800;
+                                color: #FFFFFF;
+                                line-height: 64rpx;
+
+                                .btn-img {
+                                    width: 32rpx;
+                                    height: 32rpx;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+        }
+    }
+
+    .app_container {
+        position: fixed;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+
+        .app-top {
+            display: flex;
+            background: linear-gradient(to right, #e8e8e8, #e8e8e8);
+            padding-bottom: 16rpx;
+            padding-top: 24rpx;
+
+            .top-search {
+                position: relative;
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .top-input {
+                    width: 710rpx;
+
+                    .put {
+                        padding-left: 30rpx;
+                        height: 72rpx;
+                        background: #FFFFFF;
+                        border-radius: 36rpx;
+                    }
+
+                    /deep/ .put-pla {
+                        height: 33rpx;
+                        font-size: 24rpx;
+                        font-weight: 400;
+                        color: #999999;
+                        line-height: 33rpx;
+                    }
+
+                    .input-btn {
+                        position: absolute;
+                        right: 30rpx;
+                        top: 50%;
+                        transform: translate(0, -50%);
+                        color: #FFFFFF;
+                        width: 120rpx;
+                        height: 56rpx;
+                        line-height: 56rpx;
+                        font-size: 28rpx;
+                        background: linear-gradient(157deg, #A043C1 0%, #4133A2 100%);
+                        border-radius: 29rpx;
+                    }
+                }
+            }
+        }
+
+        .view-map {
+            height: 100%;
+            width: 100%;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/project/project.vue b/pages/project/project.vue
index e0b0f27..e4466a7 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -3,9 +3,9 @@
         <view class="titleSearch">
             <view class="searchName">搜 索</view>
 
-            <u-search placeholder="搜零工岗位/搜全职岗位/搜政策" @focus="goSeach" shape="round" :showAction="false"></u-search>
+            <u-search placeholder="搜任务/搜岗位/搜政策" @focus="goSeach" shape="round" :showAction="false"></u-search>
         </view>
-        <view class="navPosition" @click="navTo('/pages/project/projectList')">
+        <view class="navPosition" @click="navTo('/pages/project/map')">
             <u-icon name="map" color="#2979ff" size="16"></u-icon>
             <view class="positionText">四川德阳市</view>
             <u-icon name="arrow-right" color="#666666" size="14"></u-icon>
@@ -174,7 +174,8 @@
                 isSearch: false,
                 searchData: {},
 
-                nonReactiveArray: ["推荐零工岗位", "推荐全职岗位"],
+                // nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"],
+                nonReactiveArray: ["推荐零工任务", "推荐岗位"],
             }
         },
         onLoad: function() {
diff --git a/static/img/direction.png b/static/img/direction.png
new file mode 100644
index 0000000000000000000000000000000000000000..952b10d707f2a08bef100abb9be07060c9dad804
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^_CV~w!3-p4eU1MKq{0JyLR^9L)`D|~Dz0rWy0oqE
z{Px0g+Y8Tw85bZT+X^r2DZjL>04xY0AqonBiq8YZcNAU#q2dcbT_9y3bngECqq#t%
zWlDnlf*IDbO9Vfg*=A=kAyr^m&9OZFpPx4`^ioqOkG{71b{J3@qraz%V~EG`w^wts
zn+-(T9u^Ck8fLBfx;6IS|Mzz?vgIdi<y7Z6cH?iT-jU-SB`aQPF8?Jnjc46yfn$zm
zu4>kVX02R*Xzk=lAJuG<UY1q6ZIjJ%xxH|+Xm0zl&@HmRGF)#joGg^vo_4eBh0<+4
z(M4}BM09U+eyVndFF$aL?5rsn)=xC{ezcV7<T_t>X#324AFR$7mxoH$B|ckq?(>;A
z@4Zi>V;3&@7ih}ycXPMj_g#8b`7x%=j}?{bcF*eDf1cNHznSR%)%o{-9xPas7r5T$
z%k4YA4i!harC07@=`5FCa=^SRsP=h}d0twJvCP+X5%0@yNqp_PRMX#nWsiCEq7}!>
zi@xkzs$zeA2g`k37teb#d6yrZaIsah`muVEN&E%FqcIQnxZ7CR^!Z$AR&KRi{LlQK
z{r|u5-=CiIo;knF{^Xv!dsQR<owN1a931I4?b2@+wdWCayKT<y0ER7tr>mdKI;Vst
E0A|Sv&Hw-a

literal 0
HcmV?d00001

diff --git a/static/img/direction2.png b/static/img/direction2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e340e1ca2342a01058096708891d87f26b52bc2f
GIT binary patch
literal 565
zcmeAS@N?(olHy`uVBq!ia0vp^_CV~w!3-p4eU1MKq%s41LR^9Lf4YD_(re3rmMN74
z`2{nqWeIvVL!#AOFtx_^=dp=-da|6KH!t*3Td}meJlaL+)+MF%|7{EmjFFx$jv*e$
z-(J0*b=X0m_2JCWNYCBdstUV>_x^W2c4L~m#Po+94jez<+l%$Fxs<1}>S{)=tvb|w
zxG=|S#_X>ZT0MdCz0a?i9^3p;s`++ru-I+CQw!cMncBW>@+`(%e!qMczFo4laoc38
z9P7;fTy@q9WkHi2ZhI!O=Bn3T1#+^1isyVW-TsinEAB7ne7!G?tEW}olR3k5-?(^+
z&Zp%uJ-_(vwsZ2lTJNg*#P<HJ<yG?Pjt_I>N^P>GC3@}U-b|C9KK=cl39f%uDb+sp
zKK=gIw`ViO|8Bbb;mBq^Y5h;11O?{HyE54sFZnwAj@9hbj3;@u|L95R>4)lwn!c<F
zJgN9O<auXEoqpA`STC*nswVn-`z{Kv+~fPQ@qXx%&#epD|0Q@lXWq3wt&dG<s<_?v
zNMA4g7$eS!*Zv>-|9t=d*LHI%I)0XY(tY;#iEZLe?(&vrw+(V^U;buGX2_a0N%8V$
QV3aU;y85}Sb4q9e0N5osHUIzs

literal 0
HcmV?d00001

diff --git a/static/img/gwpoint.png b/static/img/gwpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..9614f002402ed6d82f71b7e22547b8b26c9a8923
GIT binary patch
literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq0077U0077Y0{{R3Uv{&t0000FP)t-s0002f
zBzn{%d($L*)FXOkgpvvX000DZQchC<fWJUTCyxC900jw2L_t(|+SQwHlAACL#lxQi
zkggAqB^<!p<p9{^{%2}C(;4qZF+bZvGp)Wg_41_mo&XED)Wq;H&-3FE=l83>n8fgN
zetd~|wSZV2&v7<Pf-r*_=0_&Nc^I;cB+YaZRgc4%j4>Fc9K#%?M+iMihX4Xa=_@0T
zIXt|+U)ER0n-@S)3KHKx|I&C}&XQ$$D#3rt;D;zhPgeAzP$y87WZhpaxvB|sq6|nR
z=n6>~k}_2(3t%La_ELJlNGM;jxwRKE74sUK3%R3uR0>;bFIe2BN>|5#V`}w()wPt;
zF<JUj)@r*fA}fq~xAfI%bqx%=+PoYRtWRu!^^ln_T0TM{ph_8E4m1RVg(9{fB`n3)
zNO-A?n&e#TC1|baN0wbrK}UtK^i#2cw|bDVm@h}^urJyB%og*7k}zBBuZeiYb%Q=b
zcU<x3y!_cgOvikMLP=mU5&R)v3Q0P+hfn7(Uj#Do#%nq-@vTVr%uX0lmJ;P%UXrC`
zFS?4JhfHw%anFcCJ)dP_fI);%o^{Xg$b=07o~o7TT*|`s8dHW)NKW9D?3I?VB026y
zwwDtuz|`xOSsB>D(*av?p1**^OwExU?DHG1`_m-CXNcwNXMSVgpHXj=XU?brZ}St%
z4vd$Bq$BbT^Gc1<zs{~p0?2c+Cy<QEH;FC5S0Rcx27&O+#gGxD2ar^1$wkH;g6!Dv
zMHiXzwenpfNMegF3yH=+AU<<6Y&$(jfVQ&%NjBj#q|B|*l;dkJ{=*>SG01i%h`b2?
zcObn9U0xwPTi6|e><FT7MhW8DI(|Jm6UMUBO4kN5WG=K14T$Vv@v}HN1Gyw+;$_d?
zoU={X`D+q|cYg91kcGUF;LZ422omMbGHI8P+1T8zX?HS-LW)78k9ZoJCY5|@f)(N^
z#8qs#1LjHFO1aT`OBjh3=pO1uxn&H$VLs>dZ`>G^Pc0lg?1vTw57Vm>6Ql_sFulnw
zbi9ur4!7qrwzA<2oN!@U;9<5>If`0w>cI|X-4;|t4kTE4HrP};`70laIqVTO7mq_7
zkR{B;$`eZT<rCkUj_q6qgD1Ycr%mzkZCKQ%JC8$$kLx_Yzoq|$y*(<=QLa1QWO1<W
zaFYcAy2C<G3t4wA`PMGUR=jf8OTsnBc1ak7Md62T96gJoe-1i;DCax}U04*BME`J=
zC1FvZY@j(*t&Vz0SQIufKgefMZcQ(HR2IIsuoVoF!gnj!#Cl2C#Jd$+Y+`OM0}}&V
zD9WZcFf$w*B(dYmasTR@UiAiDP_o4)F6YaEQHW#%wtz1-qa9xkPD9L>0b9Tqz0qgK
zm(#xsxaryAOI@^JOAc!FY%yQEIvG7*qhL$Lm!2(XWR`tWe$u8SRsRk&+e2+mW~-bp
zua}+q+Hu9E|3EL6yo0aiYeKdZ0be9^8n)zM+v`7YV29pH3)P&8BTHr=J(y3?Dh9Gs
zwkxoukRD{$NgoVkXHuNJ-01n*;rIIBwsy#t{=20CWN&SiD5OfzHqtL@+4+;T{w%g+
z)}Ce8OTTA|vytANCVSpWoj^5^em%3>b2^J><p$D|fAubA|LUdRq(TNRw(zg)4B=l3
z7d!T^UV7nQ3l|I7Eu;tkDqU<?2!GaQ;9~Z#z7)}jmZk7&y^HsYSuEU$`WOugff1`!
vtY(cUOPMaF;cN<#pR-1PF^<m7)fm43ZOW5QTu2*l00000NkvXXu0mjf;z5d+

literal 0
HcmV?d00001

diff --git a/static/img/mypoint.png b/static/img/mypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..825734b34c3b09909d04b0b1247310beda7d065c
GIT binary patch
literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq0077U0077Y0{{R3Uv{&t0000FP)t-s0000Q
z`6?XyC>#4J8u}?A=psJ=000DZQchC<fIz?b0h|H=00a(6L_t(|+U%NLw&EZVgcHmH
z@Z2l_e-;om3lQl2uW24;=Jc5hq*4SP=3MJhAs^k<D6|eAee}^sKS0;(<$S%mp_|O*
zC4UspeK_Vz{*kxs88=DvaE-%QB`4c63=O6uL*+X%FokFE6rRzYG76M!P`mvpv+Phj
z#yE+pmn}wi%Jxf^Dt4?aRp=Oq${lmPulK7kvbBNq4`mfju3c%p9_Oz-KC~&V_;i2I
zEjf;B5y;C8s<R|ojt3I2-&Qdn-}cE99A1Z|vz0O+B^=C_gQNI-8IXvAFZRf8f9}j`
zIFPN#59Djh?#`>Nt}VYmv7tI!ZvWU=3kgirt}<Je`AS&oAf77sP?s%BZQNJ|@x*Y(
z6hkI?1mp1}N1g`WJ0TN$2Dt<0QI6ki=&=G~lh()ABW-z5`Aw&Mzd-&@|9N9sj`rOb
zE~&n}9~T;86GoO|Xy>OAWGsJKu0;qg$e2D!`K38*arq=!h4-cdkdOpY2<60<S79rT
zTc>zKLX4>F<|)50X(1sl4W#h2m4l4QT1$|SkMqqzJh&4Lsyhcc<ssmfIB~l%9j;E5
zO*z#=z%}(<iXTJJLsWr-Kno|(8yb^WAtcTD9Y9PA$lMKL0Ys`HGXqhzh-5{OZl1`0
zV?0s9WBrZ?5Z@RwwS}C}XBT=uFcADvZwpJqGWj(D$W#r9pxd1|sc57uM4tkW0G8|r
zyG>Kxc?f&pb{Tel$x;tlw({i%dYiy%G+Tj;)HX>c;I1aFU|hor2bUmyoh~oct=v4C
zlPRS0s=3sRHbim3bM2fkaB<=Cib=Cs8MPM&d^fwiL|#vD!eO0XD%uOQ^MNoC`wnj9
z+|9p3_(p*5aF*wrF}(BQsL^03Xe#pkF{Wu9>6T@O&hRMM5}am_0>PGGQ)FR&JRnU`
zSs1fg!kdB@coWVN)NjO#k%7~+FO(S$gMO+!N*1;R=Sw_f@Rp?aH;)<d_<ub-Vu)|>
zU#0k~eKWa17zTjg+NJ=m0s?XYNTdLq(0@(**ar{C;E^JcX#jZ!D|u{=mEqUE%c7(V
z@1O87jLa8N%>8h<#>?s6YaJ7wjXdZDj+3<e;<rQzv}GD?VM8@DuX(8!8*TBvB;Hp+
z2c5RX`;vHHW$gpl#lBX*7glVrMf;L?Uqu3a*%t0=mUv&2eg?E<GMC*1;0@xFk+WrT
z)fVsTCWBoS^&xS#Osr(bea#Z@Yf?8x&X&nsb`vU>giWuWB+izJV0M$)gVbj}>{S`m
znZ(&L5zKBX-?RYfogGd;2w=x$H<8Zn^v=!@!0cw^vezeqRQkOzGJg;`{Y@a}WzY65
z=_jF#aCWCJVu|cQoW6)Ap#NVVMLcPecm{23Y;61kFUb<2@Q44TbN~PV07*qoM6N<$
Ef++h9&;S4c

literal 0
HcmV?d00001

diff --git a/static/img/taskpoint.png b/static/img/taskpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4eb3154476a6d2de1761ae894f63ccfca72ca26
GIT binary patch
literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq0077U0077Y0{{R3Uv{&t0000FP)t-s0000S
zX8#*!{~T!l8)pA>GGqY&000DZQchC<fWJUTCyxC900jw2L_t(|+SQwHlAACL#lxQi
zkggAqB^<!p<p9{^{%2}C(;4qZF+bZvGp)Wg_41_mo&XED)Wq;H&-3FE=l83>n8fgN
zetd~|wSZV2&v7<Pf-r*_=0_&Nc^I;cB+YaZRgc4%j4>Fc9K#%?M+iMihX4Xa=_@0T
zIXt|+U)ER0n-@S)3KHKx|I&C}&XQ$$D#3rt;D;zhPgeAzP$y87WZhpaxvB|sq6|nR
z=n6>~k}_2(3t%La_ELJlNGM;jxwRKE74sUK3%R3uR0>;bFIe2BN>|5#V`}w()wPt;
zF<JUj)@r*fA}fq~xAfI%bqx%=+PoYRtWRu!^^ln_T0TM{ph_8E4m1RVg(9{fB`n3)
zNO-A?n&e#TC1|baN0wbrK}UtK^i#2cw|bDVm@h}^urJyB%og*7k}zBBuZeiYb%Q=b
zcU<x3y!_cgOvikMLP=mU5&R)v3Q0P+hfn7(Uj#Do#%nq-@vTVr%uX0lmJ;P%UXrC`
zFS?4JhfHw%anFcCJ)dP_fI);%o^{Xg$b=07o~o7TT*|`s8dHW)NKW9D?3I?VB026y
zwwDtuz|`xOSsB>D(*av?p1**^OwExU?DHG1`_m-CXNcwNXMSVgpHXj=XU?brZ}St%
z4vd$Bq$BbT^Gc1<zs{~p0?2c+Cy<QEH;FC5S0Rcx27&O+#gGxD2ar^1$wkH;g6!Dv
zMHiXzwenpfNMegF3yH=+AU<<6Y&$(jfVQ&%NjBj#q|B|*l;dkJ{=*>SG01i%h`b2?
zcObn9U0xwPTi6|e><FT7MhW8DI(|Jm6UMUBO4kN5WG=K14T$Vv@v}HN1Gyw+;$_d?
zoU={X`D+q|cYg91kcGUF;LZ422omMbGHI8P+1T8zX?HS-LW)78k9ZoJCY5|@f)(N^
z#8qs#1LjHFO1aT`OBjh3=pO1uxn&H$VLs>dZ`>G^Pc0lg?1vTw57Vm>6Ql_sFulnw
zbi9ur4!7qrwzA<2oN!@U;9<5>If`0w>cI|X-4;|t4kTE4HrP};`70laIqVTO7mq_7
zkR{B;$`eZT<rCkUj_q6qgD1Ycr%mzkZCKQ%JC8$$kLx_Yzoq|$y*(<=QLa1QWO1<W
zaFYcAy2C<G3t4wA`PMGUR=jf8OTsnBc1ak7Md62T96gJoe-1i;DCax}U04*BME`J=
zC1FvZY@j(*t&Vz0SQIufKgefMZcQ(HR2IIsuoVoF!gnj!#Cl2C#Jd$+Y+`OM0}}&V
zD9WZcFf$w*B(dYmasTR@UiAiDP_o4)F6YaEQHW#%wtz1-qa9xkPD9L>0b9Tqz0qgK
zm(#xsxaryAOI@^JOAc!FY%yQEIvG7*qhL$Lm!2(XWR`tWe$u8SRsRk&+e2+mW~-bp
zua}+q+Hu9E|3EL6yo0aiYeKdZ0be9^8n)zM+v`7YV29pH3)P&8BTHr=J(y3?Dh9Gs
zwkxoukRD{$NgoVkXHuNJ-01n*;rIIBwsy#t{=20CWN&SiD5OfzHqtL@+4+;T{w%g+
z)}Ce8OTTA|vytANCVSpWoj^5^em%3>b2^J><p$D|fAubA|LUdRq(TNRw(zg)4B=l3
z7d!T^UV7nQ3l|I7Eu;tkDqU<?2!GaQ;9~Z#z7)}jmZk7&y^HsYSuEU$`WOugff1`!
vtY(cUOPMaF;cN<#pR-1PF^<m7)fm43ZOW5QTu2*l00000NkvXXu0mjfq5q0n

literal 0
HcmV?d00001

diff --git a/untils/tools.js b/untils/tools.js
index ca303be..0e3e4b9 100644
--- a/untils/tools.js
+++ b/untils/tools.js
@@ -1,4 +1,4 @@
-function onDialingPhoneNumber(phone) {
+export function onDialingPhoneNumber(phone) {
     return new Promise((resolve, reject) => {
         uni.makePhoneCall({
             phoneNumber: phone, // 电话号码
@@ -11,8 +11,39 @@ function onDialingPhoneNumber(phone) {
         });
     })
 }
+/**
+ * 个位数，加0前缀
+ * @param {*} number
+ * @returns
+ */
+export function addZeroPrefix(number) {
+    return number < 10 ? `0${number}` : number
+}
+
+export function getDistanceFromLatLonInKm(lat1, lon1, lat2, lon2) {
+    const R = 6371; // 地球平均半径，单位为公里
+    const dLat = deg2rad(lat2 - lat1);
+    const dLon = deg2rad(lon2 - lon1);
+    const a =
+        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+        Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) *
+        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    const d = R * c;
+    return {
+        km: d,
+        m: d * 1000
+    };
+}
+
+// 将角度转换为弧度
+function deg2rad(deg) {
+    return deg * (Math.PI / 180);
+}
 
 
 export default {
-    onDialingPhoneNumber
+    onDialingPhoneNumber,
+    addZeroPrefix,
+    getDistanceFromLatLonInKm
 }
\ No newline at end of file