From 16edf86b6d026ea3955b6d954b784b970292013a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 10 Feb 2022 09:31:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
leafletMapOur/grabOrdersMap/xcxmap.html | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/leafletMapOur/grabOrdersMap/xcxmap.html b/leafletMapOur/grabOrdersMap/xcxmap.html
index bbe236e..100935f 100644
--- a/leafletMapOur/grabOrdersMap/xcxmap.html
+++ b/leafletMapOur/grabOrdersMap/xcxmap.html
@@ -136,7 +136,14 @@
</span>
</div>
<div class="once-c">
- <el-button :type="data.type==1?'success':'primary'" @click="openAPP(data.type)">{{data.type==1?'我参与':'我反馈'}}</el-button>
+ <!-- <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)"
+ :disabled="(data.num==data.jnum)&& data.buttype==1 ||data.type == 1">
+ {{data.buttype==1?(data.num==data.jnum?"人数已满":'我参与'):(data.type == 1?'完成反馈':'上传反馈')}}
+ </el-button>
</div>
</div>
<!-- </div>
--
Gitblit v1.9.3