.

src/components/TeamMember.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="team-member">
         <div class="user">
-            <img class="avatar" :src="avatar">
+            <img class="avatar" :src="avatar" />
             <div class="name">{{nickname}}</div>
-            <button :class="btnClass" @click="click" v-if="btn">{{btn}}</button>
+            <button :class="[btnClass, gray?'gray':'']" @click="click" v-if="btn">{{btn}}</button>
         </div>
         <div class="info">
             <div class="col left">
@@ -34,6 +34,7 @@ export default {
             default: 0,
         },
         btn: String,
+        gray: Boolean,
     },
     computed: {
         btnClass() {
@@ -100,6 +101,11 @@ export default {
             font-weight: bold;
             color: @textColorPrimaryLight;
         }
+        .gray {
+            background: @textColorSecondaryDark;
+            color: white;
+            box-shadow: none;
+        }
     }
     .info {
         font-size: 0;

src/pages/destination/destination.vue

@@ -1,19 +1,28 @@
 <template>
     <div class="container">
-        <map class="map" id="map" :longitude="origin.longitude" :latitude="origin.latitude"
-             subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
-             layer-style="1"
-             scale="10"
-             :markers="markers"
-             @regionchange="regionChange"
-             @begin="regionChangeBegin"
-             @end="regionChangeEnd"
-             @markertap="markerTap">
+        <map
+            class="map"
+            id="map"
+            :longitude="origin.longitude"
+            :latitude="origin.latitude"
+            subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
+            layer-style="1"
+            scale="8"
+            :markers="markers"
+            @regionchange="regionChange"
+            @begin="regionChangeBegin"
+            @end="regionChangeEnd"
+            @markertap="markerTap"
+        >
             <cover-view class="header" :style="{paddingTop: sysInfo.statusBarHeight+'px'}">
                 <cover-image class="bg" src="/static/images/bg_nav.png"></cover-image>
                 <cover-view class="content" :style="{top: sysInfo.statusBarHeight+'px'}">
                     <cover-view class="title">
-                        <cover-image src="/static/images/icon_back_white.png" class="icon-back" @click="back"></cover-image>选择目的地
+                        <cover-image
+                            src="/static/images/icon_back_white.png"
+                            class="icon-back"
+                            @click="back"
+                        ></cover-image>选择目的地
                     </cover-view>
                     <cover-view class="card">
                         <cover-view class="endpoint">
@@ -22,12 +31,12 @@
                         </cover-view>
                         <cover-view class="line">
                             <cover-view class="row">
-                                <cover-view>所需步数 </cover-view>
+                                <cover-view>所需步数</cover-view>
                                 <cover-view class="highlight">{{step}}步</cover-view>
                             </cover-view>
                             <cover-view class="divider"></cover-view>
                             <cover-view class="row">
-                                <cover-view>赛段奖金 </cover-view>
+                                <cover-view>赛段奖金</cover-view>
                                 <cover-view class="highlight">{{award}}商城币</cover-view>
                             </cover-view>
                         </cover-view>
@@ -38,7 +47,11 @@
                     </cover-view>
                 </cover-view>
             </cover-view>
-            <cover-image :src="destination.id?'/static/images/btn_confirm_pre.png':'/static/images/btn_confirm.png'" class="btn-confirm" @click="confirm"></cover-image>
+            <cover-image
+                :src="destination.id?'/static/images/btn_confirm_pre.png':'/static/images/btn_confirm.png'"
+                class="btn-confirm"
+                @click="confirm"
+            ></cover-image>
         </map>
         <canvas id="myCanvas"></canvas>
     </div>
@@ -81,18 +94,9 @@ export default {
             ctx.getRegion({
                 success: res => {
                     this.$http
-                        .post(
-                            'map/citiesInRegion',
-                            {
-                                northeast: res.northeast,
-                                southwest: res.southwest,
-                            },
-                            {
-                                header: {
-                                    'content-type': 'application/json',
-                                },
-                            }
-                        )
+                        .get('/map/nearCities', {
+                            id: this.origin.id,
+                        })
                         .then(res => {
                             if (res.success) {
                                 res.data = res.data.filter(i => i.id !== this.origin.id && i.id !== this.destination.id);
@@ -102,8 +106,8 @@ export default {
                                         id: i.id,
                                         latitude: i.latitude,
                                         longitude: i.longitude,
-                                        width: 44,
-                                        height: 47,
+                                        width: 52,
+                                        height: 56,
                                         label: {
                                             content: ` ${i.name} `,
                                             color: '#000000',
@@ -120,8 +124,8 @@ export default {
                                     id: this.origin.id,
                                     latitude: this.origin.latitude,
                                     longitude: this.origin.longitude,
-                                    width: 44,
-                                    height: 47,
+                                    width: 52,
+                                    height: 56,
                                     label: {
                                         content: ` ${this.origin.name} `,
                                         color: '#000000',
@@ -199,8 +203,8 @@ export default {
             if (index > -1) {
                 let marker = this.markers[index];
                 marker.iconPath = '/static/images/marker_gift_active.png';
-                marker.width = 44;
-                marker.height = 47;
+                marker.width = 52;
+                marker.height = 56;
                 marker.label.color = '#000000';
                 marker.label.bgColor = '#ffffff';
                 marker.label.anchorY = 0;
@@ -226,11 +230,11 @@ export default {
             if (index > -1) {
                 let marker = this.markers[index];
                 marker.iconPath = '/static/images/marker_gift_active_light.png';
-                marker.width = 84;
-                marker.height = 84;
+                marker.width = 83;
+                marker.height = 83;
                 marker.label.color = '#ffffff';
                 marker.label.bgColor = '#4c80ff';
-                marker.label.anchorY = -5;
+                marker.label.anchorY = -8;
                 this.$set(this.markers, index, marker);
             }
         },

src/pages/home/home.vue

@@ -1,17 +1,21 @@
 <template>
     <form class="container" report-submit="true" @submit="submit">
-        <map class="map" id="map"
-             subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
-             layer-style="1"
-             :longitude="center.longitude" :latitude="center.latitude"
-             scale="10"
-             :polyline="polyline"
-             :markers="markers"
-             @regionchange="regionChange"
-             @begin="regionChangeBegin"
-             @end="regionChangeEnd"
-             @updated="updated"
-             @markertap="markerTap">
+        <map
+            class="map"
+            id="map"
+            subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
+            layer-style="1"
+            :longitude="center.longitude"
+            :latitude="center.latitude"
+            scale="13"
+            :polyline="polyline"
+            :markers="markers"
+            @regionchange="regionChange"
+            @begin="regionChangeBegin"
+            @end="regionChangeEnd"
+            @updated="updated"
+            @markertap="markerTap"
+        >
             <cover-view class="header" :style="{paddingTop: sysInfo.statusBarHeight+'px'}">
                 <cover-image class="bg" src="/static/images/bg_nav.png"></cover-image>
                 <cover-view class="content" :style="{top: sysInfo.statusBarHeight+'px'}">
@@ -77,7 +81,9 @@ for (let key in city) {
     cities = cities.concat(city[key]);
 }
 export default {
-    async onLoad() {
+    async onShow() {
+        cvsCtx = wx.createCanvasContext('myCanvas');
+        cvsCtx.font = 'normal normal 12px arial';
         try {
             var token = wx.getStorageSync('token');
             if (token) {
@@ -194,8 +200,8 @@ export default {
                     iconPath: '/static/images/marker_origin.png',
                     latitude: res.data.origin.latitude,
                     longitude: res.data.origin.longitude,
-                    width: 44,
-                    height: 47,
+                    width: 52,
+                    height: 56,
                     label: {
                         content: ` ${res.data.origin.name} `,
                         color: '#000000',
@@ -213,8 +219,8 @@ export default {
                     iconPath: '/static/images/marker_gift_active.png',
                     latitude: res.data.destination.latitude,
                     longitude: res.data.destination.longitude,
-                    width: 44,
-                    height: 47,
+                    width: 52,
+                    height: 56,
                     anchor: {
                         x: 0.5,
                         y: 0.8,
@@ -236,8 +242,8 @@ export default {
                     iconPath: `http://walk-china.oss-cn-hangzhou.aliyuncs.com/marker/location/${this.userInfo ? this.userInfo.id : ''}.png`,
                     latitude: points2[points2.length - 1].latitude,
                     longitude: points2[points2.length - 1].longitude,
-                    width: 44,
-                    height: 47,
+                    width: 52,
+                    height: 56,
                     anchor: {
                         x: 0.5,
                         y: 0.8,
@@ -264,8 +270,8 @@ export default {
                         iconPath: i.received ? '/static/images/marker_gift.png' : '/static/images/marker_gift_active.png',
                         latitude: i.latitude,
                         longitude: i.longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         anchor: { x: 0.5, y: 0.9 },
                     };
                     if (i.showLabel) {
@@ -277,7 +283,7 @@ export default {
                             borderRadius: 18,
                             padding: 1,
                             fontSize: 10,
-                            anchorY: -60,
+                            anchorY: -68,
                             anchorX: -cvsCtx.measureText(i.labelContent).width / 2 - 1,
                         };
                     } else if (this.progress >= i.needProgress * 100 && !i.received) {
@@ -291,8 +297,9 @@ export default {
                             textAlign: 'left',
                             bgColor: '#FF9500',
                             borderRadius: 18,
+                            padding: 1,
                             fontSize: 10,
-                            anchorY: -65,
+                            anchorY: -68,
                             anchorX: -cvsCtx.measureText(' 领奖金 ').width / 2,
                         };
                     }
@@ -324,10 +331,6 @@ export default {
         if (userMap && userMap.progress >= 1) {
         }
     },
-    onShow() {
-        cvsCtx = wx.createCanvasContext('myCanvas');
-        cvsCtx.font = 'normal normal 12px arial';
-    },
     data() {
         return {
             center: {
@@ -389,8 +392,8 @@ export default {
                         id: 'user' + i.userId,
                         latitude: i.latitude,
                         longitude: i.longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         anchor: {
                             x: 0.5,
                             y: 0,
@@ -405,7 +408,7 @@ export default {
                                   padding: 1,
                                   fontSize: 10,
                                   borderColor: '#ffffff',
-                                  anchorY: -15,
+                                  anchorY: -18,
                                   anchorX: -cvsCtx.measureText(' 偷奖金 ').width / 2 - 1,
                               }
                             : {},
@@ -492,8 +495,8 @@ export default {
                             let marker = {
                                 ...this.journeyMarkers[index],
                                 iconPath: '/static/images/marker_gift.png',
-                                width: 44,
-                                height: 47,
+                                width: 52,
+                                height: 56,
                                 anchor: { x: 0.5, y: 0.9 },
                                 label: {},
                             };
@@ -629,18 +632,27 @@ export default {
                 border: none;
             }
         }
-        cover-image {
-            margin-top: 15px;
-        }
         &.left {
             left: 12px;
+            button {
+                width: 54px;
+                height: 52px;
+                margin-top: 7px;
+                .flex();
+            }
             cover-image {
-                width: 46px;
-                height: 44px;
+                width: 54px;
+                height: 52px;
             }
         }
         &.right {
             right: 12px;
+            button {
+                width: 50px;
+                height: 50px;
+                margin-top: 12px;
+                .flex();
+            }
             cover-image {
                 width: 50px;
                 height: 50px;
@@ -648,10 +660,6 @@ export default {
         }
         .msg-wrapper {
             position: relative;
-            margin-top: 15px;
-            cover-image {
-                margin-top: 0;
-            }
             .badge {
                 position: absolute;
                 right: 2px;

src/pages/myTeam/myTeam.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="container" :style="{paddingBottom:64+sysInfo.navigationBarHeight+'px'}">
         <div class="my-info">
-            <img :src="userInfo.avatar" class="avatar">
+            <img :src="userInfo.avatar" class="avatar" />
             <div class="price-wrapper">
                 <div>我的身价</div>
-                <div class="price">{{myPrice}}商城币</div>
+                <div class="price">{{userInfo.price}}商城币</div>
             </div>
         </div>
         <div class="tabs">
@@ -13,41 +13,52 @@
             <div class="tab" :class="{active:tab===2}" @click="tab=2">我的队长</div>
         </div>
         <div v-if="tab===0" :key="tab0">
-            <team-member v-for="item in friends" :key="item.userId+1000000"
-                         :avatar="item.avatar"
-                         :nickname="item.nickname"
-                         :todaySteps="item.todaySteps"
-                         :price="item.price"
-                         :btn="item.hired?'':'抢雇'"
-                         @btnClick="hire(item)">
-            </team-member>
+            <team-member
+                v-for="item in friends"
+                :key="item.userId+1000000"
+                :avatar="item.avatar"
+                :nickname="item.nickname"
+                :todaySteps="item.todaySteps"
+                :price="item.price"
+                btn="抢雇"
+                :gray="showGray(item)"
+                @btnClick="hire(item)"
+            ></team-member>
         </div>
         <div v-if="tab===1" :key="tab1">
-            <team-member v-for="item in teamMembers" :key="item.userId"
-                         :avatar="item.avatar"
-                         :nickname="item.nickname"
-                         :todaySteps="item.todaySteps"
-                         :price="item.price"
-                         :btn="item.shouldWake?'唤醒':'打赏'"
-                         @btnClick="wakeOrReward(item)">
-            </team-member>
+            <team-member
+                v-for="item in teamMembers"
+                :key="item.userId"
+                :avatar="item.avatar"
+                :nickname="item.nickname"
+                :todaySteps="item.todaySteps"
+                :price="item.price"
+                :btn="item.shouldWake?'唤醒':'打赏'"
+                @btnClick="wakeOrReward(item)"
+            ></team-member>
         </div>
         <div v-if="tab===2&&myLeader" :key="tab2">
-            <team-member :avatar="myLeader.avatar"
-                         :nickname="myLeader.nickname"
-                         :todaySteps="myLeader.todaySteps"
-                         :price="myLeader.price">
-            </team-member>
+            <team-member
+                :avatar="myLeader.avatar"
+                :nickname="myLeader.nickname"
+                :todaySteps="myLeader.todaySteps"
+                :price="myLeader.price"
+            ></team-member>
         </div>
 
-        <button class="btn-recruit" :style="{bottom: (sysInfo.navigationBarHeight||8)+'px'}" @click="recruit">招募新队员</button>
-        <alert-dialog type="float"
-                      :visible.sync="showDialog"
-                      :icon="dialog.icon"
-                      :title="dialog.title"
-                      :message="dialog.message"
-                      @confirm="dialog.confirm">
-        </alert-dialog>
+        <button
+            class="btn-recruit"
+            :style="{bottom: (sysInfo.navigationBarHeight||8)+'px'}"
+            @click="recruit"
+        >招募新队员</button>
+        <alert-dialog
+            type="float"
+            :visible.sync="showDialog"
+            :icon="dialog.icon"
+            :title="dialog.title"
+            :message="dialog.message"
+            @confirm="dialog.confirm"
+        ></alert-dialog>
 
         <div class="share" v-if="showShare">
             <div class="mask"></div>
@@ -61,18 +72,25 @@
                 </div>
                 <div class="icons">
                     <button class="item btn-share" @click="share" open-type="share">
-                        <img src="/static/images/share_friend.png" class="icon">
+                        <img src="/static/images/share_friend.png" class="icon" />
                         <div class="label">微信招募</div>
                     </button>
                     <div class="item" @click="saveToAlbum">
-                        <img src="/static/images/share_timeline.png" class="icon">
+                        <img src="/static/images/share_timeline.png" class="icon" />
                         <div class="label">发朋友圈招募</div>
                     </div>
                 </div>
-                <div class="btn-cancel" :style="{paddingBottom:sysInfo.navigationBarHeight+'px'}" @click="showShare=false">取消</div>
+                <div
+                    class="btn-cancel"
+                    :style="{paddingBottom:sysInfo.navigationBarHeight+'px'}"
+                    @click="showShare=false"
+                >取消</div>
             </div>
-            <div class="share-img-wrapper" :style="{paddingBottom: (sysInfo.navigationBarHeight||8)+'px'}">
-                <img :src="shareImg" class="share-img" mode="aspectFit">
+            <div
+                class="share-img-wrapper"
+                :style="{paddingBottom: (sysInfo.navigationBarHeight||8)+'px'}"
+            >
+                <img :src="shareImg" class="share-img" mode="aspectFit" />
             </div>
         </div>
     </div>
@@ -103,9 +121,6 @@ export default {
     },
     computed: {
         ...mapState(['userInfo', 'sysInfo']),
-        myPrice() {
-            return Number(((this.userInfo.totalSteps || 0) * Constants.HIRE_PRICE_RATE).toFixed(1));
-        },
         shareImgSize() {
             return {
                 width: this.sysInfo.windowWidth - 108 + 'px',
@@ -145,7 +160,32 @@ export default {
                 }
             });
         },
+        showGray(item) {
+            if (item.hiredBy) {
+                if (item.hiredBy === this.userInfo.id) {
+                    return true;
+                } else if (item.hireDate === this.formatTime(new Date(), 'YYYY-MM-DD')) {
+                    return true;
+                }
+            }
+            return false;
+        },
         hire(item) {
+            if (item.hiredBy) {
+                if (item.hiredBy === this.userInfo.id) {
+                    wx.showToast({
+                        title: 'Ta已经是你的队员了哦～',
+                        icon: 'none',
+                    });
+                    return;
+                } else if (item.hireDate === this.formatTime(new Date(), 'YYYY-MM-DD')) {
+                    wx.showToast({
+                        title: 'Ta已经被别人抢雇了，明天再来试试吧～',
+                        icon: 'none',
+                    });
+                    return;
+                }
+            }
             this.dialog = {
                 icon: item.avatar,
                 title: item.nickname,

src/pages/rank/rank.vue

@@ -1,18 +1,16 @@
 <template>
     <div class="container">
         <div class="head">
-            <img class="avatar" :src="userInfo.avatar">
+            <img class="avatar" :src="userInfo.avatar" />
             <div class="info">
                 <div class="left">
                     <div class="value">{{myRank}}</div>
                     <div class="label">好友排名</div>
                 </div>
                 <div class="center">
-                    <div class="nickname">
-                        {{userInfo.nickname}}
-                    </div>
+                    <div class="nickname">{{userInfo.nickname}}</div>
                     <div class="level">
-                        <img class="level-icon" :src="levelIcon">
+                        <img class="level-icon" :src="levelIcon" />
                         <div class="level-name" :style="{color:levelColor}">{{levelName}}</div>
                     </div>
                 </div>
@@ -24,13 +22,14 @@
         </div>
         <div class="list">
             <div class="item" v-for="item in list" :key="item.userId">
-                <img class="rank-icon" :src="item.rankIcon" v-if="item.rankIcon">
+                <img class="rank-icon" :src="item.rankIcon" v-if="item.rankIcon" />
                 <div class="rank" v-else>{{item.rank}}</div>
+                <img class="avatar" :src="item.avatar" />
                 <div class="info">
                     <div class="name">{{item.nickname}}</div>
                     <div class="desc">已途经城市 {{item.walkCities}} 座</div>
                 </div>
-                <img class="level-icon" :src="item.levelIcon">
+                <img class="level-icon" :src="item.levelIcon" />
                 <div class="level-name" :style="{color:item.levelColor}">{{item.levelName}}</div>
             </div>
         </div>
@@ -59,8 +58,7 @@ export default {
             return this.getLevelColor(this.userInfo.level);
         },
     },
-    methods: {
-    },
+    methods: {},
     onLoad() {
         this.$http.get('/user/friendRank').then(res => {
             if (res.success) {
@@ -174,6 +172,7 @@ export default {
                 border-radius: 20px;
             }
             .info {
+                margin-left: 10px;
                 display: flex;
                 flex-direction: column;
                 flex-grow: 1;

src/pages/userJourney/userJourney.vue

@@ -1,25 +1,39 @@
 <template>
     <div class="container">
-        <map class="map" id="map"
-             subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
-             layer-style="1"
-             :longitude="center.longitude" :latitude="center.latitude"
-             scale="9"
-             :polyline="polyline"
-             :markers="markers"
-             @markertap="markerTap">
+        <map
+            class="map"
+            id="map"
+            subkey="YO4BZ-G75L5-CWJIV-QDPOY-77OIH-LGFMT"
+            layer-style="1"
+            :longitude="center.longitude"
+            :latitude="center.latitude"
+            scale="13"
+            :polyline="polyline"
+            :markers="markers"
+            @markertap="markerTap"
+        >
             <cover-view class="header" :style="{paddingTop: sysInfo.statusBarHeight+'px'}">
                 <cover-image class="bg" src="/static/images/bg_nav.png"></cover-image>
                 <cover-view class="content" :style="{top: sysInfo.statusBarHeight+'px'}">
                     <cover-view class="title">
-                        <cover-image src="/static/images/icon_back_white.png" class="icon-back" @click="back"></cover-image>Ta的资料
+                        <cover-image
+                            src="/static/images/icon_back_white.png"
+                            class="icon-back"
+                            @click="back"
+                        ></cover-image>Ta的资料
                     </cover-view>
                     <cover-view class="card">
                         <cover-view class="user">
-                            <cover-image class="avatar" :src="userInfo.avatar||'https://microball.oss-cn-hangzhou.aliyuncs.com/awesomeAdmin/user.png'"></cover-image>
+                            <cover-image
+                                class="avatar"
+                                :src="userInfo.avatar||'https://microball.oss-cn-hangzhou.aliyuncs.com/awesomeAdmin/user.png'"
+                            ></cover-image>
                             <cover-view class="name">{{userInfo.nickname}}</cover-view>
                             <cover-image class="level-icon" :src="level.icon"></cover-image>
-                            <cover-view class="level-name" :style="{color:level.color}">{{level.name}}</cover-view>
+                            <cover-view
+                                class="level-name"
+                                :style="{color:level.color}"
+                            >{{level.name}}</cover-view>
                         </cover-view>
                         <cover-view class="profile">
                             <cover-view class="row">
@@ -45,10 +59,18 @@
                         </cover-view>
                         <cover-view class="btns">
                             <cover-view class="btn-wrapper">
-                                <cover-image class="btn" src="/static/images/btn_view_member.png" @click="viewMember"></cover-image>
+                                <cover-image
+                                    class="btn"
+                                    src="/static/images/btn_view_member.png"
+                                    @click="viewMember"
+                                ></cover-image>
                             </cover-view>
                             <cover-view class="btn-wrapper">
-                                <cover-image class="btn" :src="canHire?'/static/images/btn_hire.png':'/static/images/btn_hired.png'" @click="hire"></cover-image>
+                                <cover-image
+                                    class="btn"
+                                    :src="canHire?'/static/images/btn_hire.png':'/static/images/btn_hired.png'"
+                                    @click="hire"
+                                ></cover-image>
                             </cover-view>
                         </cover-view>
                     </cover-view>
@@ -148,10 +170,10 @@ export default {
                         nickname: res.data.nickname,
                         level: res.data.level,
                         avatar: res.data.avatar,
-                        price: Number((res.data.totalSteps * Constants.HIRE_PRICE_RATE).toFixed(1)),
                         walkCities: res.data.walkCities,
                         todaySteps: res.data.todaySteps,
                         totalSteps: res.data.totalSteps,
+                        price: res.data.price,
                     };
                 }
             });
@@ -201,7 +223,7 @@ export default {
                     },
                 ];
                 this.center = {
-                    latitude: points2[points2.length - 1].latitude + 0.1,
+                    latitude: points2[points2.length - 1].latitude + 0.01,
                     longitude: points2[points2.length - 1].longitude,
                 };
                 cvsCtx.font = 'normal normal 12px arial';
@@ -211,8 +233,8 @@ export default {
                         iconPath: '/static/images/marker_origin.png',
                         latitude: res.data.origin.latitude,
                         longitude: res.data.origin.longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         label: {
                             content: ` ${res.data.origin.name} `,
                             color: '#000000',
@@ -230,8 +252,8 @@ export default {
                         iconPath: '/static/images/marker_gift_active.png',
                         latitude: res.data.destination.latitude,
                         longitude: res.data.destination.longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         anchor: {
                             x: 0.5,
                             y: 0.8,
@@ -253,8 +275,8 @@ export default {
                         iconPath: `http://walk-china.oss-cn-hangzhou.aliyuncs.com/marker/user/${this.userInfo ? this.userInfo.id : ''}.png`,
                         latitude: points2[points2.length - 1].latitude,
                         longitude: points2[points2.length - 1].longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         anchor: {
                             x: 0.5,
                             y: 0.8,
@@ -275,8 +297,8 @@ export default {
                         iconPath: i.received ? '/static/images/marker_gift.png' : '/static/images/marker_gift_active.png',
                         latitude: i.latitude,
                         longitude: i.longitude,
-                        width: 44,
-                        height: 47,
+                        width: 52,
+                        height: 56,
                         anchor: { x: 0.5, y: 0.9 },
                     };
                     if (i.showLabel) {
@@ -287,7 +309,7 @@ export default {
                             bgColor: '#0000009E',
                             borderRadius: 18,
                             fontSize: 10,
-                            anchorY: -60,
+                            anchorY: -68,
                             anchorX: -cvsCtx.measureText(i.labelContent).width / 2 - 1,
                         };
                     } else if (this.progress >= i.needProgress * 100 && !i.received) {
@@ -296,14 +318,14 @@ export default {
                         marker.anchor = { x: 0.5, y: 0.8 };
                         marker.iconPath = '/static/images/marker_gift_active_light.png';
                         marker.label = {
-                            content: ' 领奖金 ',
+                            content: ' 偷奖金 ',
                             color: '#ffffff',
                             textAlign: 'left',
                             bgColor: '#FF9500',
                             borderRadius: 18,
                             fontSize: 10,
-                            anchorY: -65,
-                            anchorX: -cvsCtx.measureText(' 领奖金 ').width / 2,
+                            anchorY: -68,
+                            anchorX: -cvsCtx.measureText(' 偷奖金 ').width / 2,
                         };
                     }
                     markers.push(marker);
@@ -336,8 +358,8 @@ export default {
                             let marker = {
                                 ...this.markers[index],
                                 iconPath: '/static/images/marker_gift.png',
-                                width: 44,
-                                height: 47,
+                                width: 52,
+                                height: 56,
                                 anchor: { x: 0.5, y: 0.9 },
                                 label: {},
                             };
@@ -502,7 +524,7 @@ export default {
             .btns {
                 display: flex;
                 align-items: center;
-                margin-top: 10px;
+                margin-top: 17px;
                 margin-bottom: 8px;
                 .btn-wrapper {
                     flex-basis: 0;

src/utils/http.js

@@ -1,5 +1,5 @@
-const baseUrl = 'http://192.168.50.132:8080';
-// const baseUrl = 'https://walkchina.izouma.com';
+// const baseUrl = 'http://192.168.50.132:8080';
+const baseUrl = 'https://walkchina.izouma.com';
 function parseUrl(url) {
     let _baseUrl = baseUrl;
     if (url.startsWith('http')) {