From 93dade2fc9c58d69b2fe2361675b9d9647e5c130 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Sat, 19 Feb 2022 10:51:52 +0800
Subject: [PATCH] +任务发布地图和列表更改逻辑和字段
---
leafletMapOur/grabOrdersMap/xcxmap.html | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/leafletMapOur/grabOrdersMap/xcxmap.html b/leafletMapOur/grabOrdersMap/xcxmap.html
index d92e93e..c8e1405 100644
--- a/leafletMapOur/grabOrdersMap/xcxmap.html
+++ b/leafletMapOur/grabOrdersMap/xcxmap.html
@@ -55,6 +55,11 @@
<!-- sha1加密 -->
<!-- <script src="./js/sha1.js"></script> -->
<script src="http://pv.sohu.com/cityjson?ie=utf-8"></script>
+ <!-- 高德地图路线规划 -->
+ <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=4b3e1db3211054ce5b466407cbb9d221">
+ </script>
+ <!-- myDomMove -->
+ <script src="./js/getPosition.js"></script>
</head>
<body>
@@ -70,7 +75,8 @@
</div>
</div>
<div class="dingwei" @click="locationMap">
- <img style="width: 60%" src="./img/dingwei.png" alt="">
+ <img v-show="!mapPositionLoding" style="width: 60%" src="./img/dingwei.png" alt="">
+ <img v-show="mapPositionLoding" style="width: 60%" src="./img/dingwei.png" alt="">
</div>
<!-- <div class="shuaxin" @click="refreshMap">
<img style="width: 60%" src="./img/刷新.png" alt="">
@@ -116,7 +122,7 @@
发布者
</span>
<span class="once-right">
- {{data.publisher}}
+ <span>{{data.publisher}}</span>
</span>
</div>
<div class="once">
@@ -159,13 +165,16 @@
<span v-for="(item,index) in data.team">{{item}}</span>
</span>
</div>
- <div class="once-c" v-if="data.buttype==1 || data.iscation == 1">
- <!-- <el-button :type="data.type==1?'success':'primary'" >{{data.type==1?'我参与':'我反馈'}}</el-button> -->
- <!-- <el-button :type="data.num==data.jnum?'info':(data.type==1?'success':'primary')" @click="openAPP(data.type)" :disabled="data.num==data.jnum">{{data.num==data.jnum?"人数已满":(data.type==1?'我参与':'我反馈')}}</el-button> -->
- <el-button :type="data.buttype==1?(data.num==data.jnum||data.type==1?'info':'success'):'primary'"
- @click="openAPP(data.buttype)"
+ <div class="once-c" v-if="data.buttype == 0">
+ <el-button :type="data.butCT == 'beginUp'?'primary':data.butCT == 'begin'?'success':'info'"
+ @click="openAPP(data.buttype)" :disabled="data.butCT== 'over' || data.iscation == '0'">
+ {{data.butCT == 'beginUp'?(data.iscation == '0'?'正在进行':'上传反馈'):data.butCT == 'begin'?(data.iscation == '0'?'还未开始':'开始任务'):'任务完成'}}
+ </el-button>
+ </div>
+ <div class="once-c" v-if="data.buttype == 1">
+ <el-button :type="data.num==data.jnum?'info':'success'" @click="openAPP(data.buttype)"
:disabled="(data.num==data.jnum)&& data.buttype==1 ||data.type == 1">
- {{data.buttype==1?(data.num==data.jnum?"人数已满":'我参与'):(data.type == 1?'完成反馈':'上传反馈')}}
+ {{data.num==data.jnum?"人数已满":'我参与'}}
</el-button>
</div>
</div>
--
Gitblit v1.9.3