From d25a69f40c327f8bd72a7a16d5090bc85f6952df Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Feb 2022 09:20:52 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android

---
 leafletMapOur/grabOrdersMap/xcxmap.html |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/leafletMapOur/grabOrdersMap/xcxmap.html b/leafletMapOur/grabOrdersMap/xcxmap.html
index 100935f..d92e93e 100644
--- a/leafletMapOur/grabOrdersMap/xcxmap.html
+++ b/leafletMapOur/grabOrdersMap/xcxmap.html
@@ -97,7 +97,7 @@
 				</div>
 				<div class="once">
 					<span class="once-left">
-						任务标题：
+						任务标题
 					</span>
 					<span class="once-right">
 						{{data.rname}}
@@ -105,7 +105,7 @@
 				</div>
 				<div class="once">
 					<span class="once-left">
-						任务内容：
+						任务内容
 					</span>
 					<span class="once-right">
 						{{data.content}}
@@ -113,7 +113,15 @@
 				</div>
 				<div class="once">
 					<span class="once-left">
-						任务地区：
+						发布者
+					</span>
+					<span class="once-right">
+						{{data.publisher}}
+					</span>
+				</div>
+				<div class="once">
+					<span class="once-left">
+						任务地区
 					</span>
 					<span class="once-right">
 						{{data.province}}&nbsp;-&nbsp;{{data.city}}&nbsp;-&nbsp;{{data.district}}
@@ -121,7 +129,7 @@
 				</div>
 				<div class="once">
 					<span class="once-left">
-						开始时间：
+						开始时间
 					</span>
 					<span class="once-right">
 						{{data.time}}
@@ -129,17 +137,32 @@
 				</div>
 				<div class="once">
 					<span class="once-left">
-						人&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数：
+						人数
 					</span>
 					<span class="once-right">
 						{{data.num}}&nbsp;/&nbsp;{{data.jnum}}
 					</span>
 				</div>
-				<div class="once-c">
+				<div class="once">
+					<span class="once-left">
+						队长
+					</span>
+					<span class="once-right">
+						<span>{{data.captain}}</span>
+					</span>
+				</div>
+				<div class="once">
+					<span class="once-left">
+						参与者
+					</span>
+					<span class="once-right">
+						<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'"
+					<el-button :type="data.buttype==1?(data.num==data.jnum||data.type==1?'info':'success'):'primary'"
 						@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?'完成反馈':'上传反馈')}}

--
Gitblit v1.9.3