显示修复

dev
许宏杰 2 years ago
parent 14572b90b2
commit 43f9c1d6e6

@ -6,8 +6,8 @@ ENV = 'development'
# 苏州园区志愿服务活动区块链平台/开发环境 # 苏州园区志愿服务活动区块链平台/开发环境
# VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api' # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
# VUE_APP_BASE_API = 'http://39.101.188.84:9034' VUE_APP_BASE_API = 'http://39.101.188.84:9034'
VUE_APP_BASE_API = 'http:///192.168.0.121:9034' # VUE_APP_BASE_API = 'http:///192.168.0.121:9034'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -24,7 +24,13 @@
<el-table-column label="兑换时间" align="center" prop="createTime" /> <el-table-column label="兑换时间" align="center" prop="createTime" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status == 1 ? "已发放" : "未发放" }} <span
:style="{
color: scope.row.status == 1 ? '#67C23A' : '#F56C6C',
}"
>
{{ scope.row.status == 1 ? "已发放" : "未发放" }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

@ -90,12 +90,15 @@
<div class="look" @click="looks1(item.id)"></div> <div class="look" @click="looks1(item.id)"></div>
<div <div
class="looks" class="looks"
style="margin:0 0 0 10px" style="margin: 0 0 0 10px"
@click="invite(item)" @click="invite(item)"
v-if="detailData.status == 1 && item.status == 0" v-if="detailData.status == 1 && item.status == 0"
> >
邀请 邀请
</div> </div>
<div class="looks" style="margin: 0 0 0 10px" v-else>
已邀请
</div>
</div> </div>
</div> </div>
</div> </div>
@ -428,30 +431,28 @@ export default {
this.$modal this.$modal
.confirm("是否确认邀请该人参加活动?") .confirm("是否确认邀请该人参加活动?")
.then(() => { .then(() => {
yaoqingAdd(e.id).then( yaoqingAdd(e.id).then(() => {
() => { this.$modal.msgSuccess("邀请成功");
this.$modal.msgSuccess("邀请成功");
activityGet(this.e).then((res) => { activityGet(this.e).then((res) => {
this.detailData = res.data; this.detailData = res.data;
for (let key1 in this.personParams) { for (let key1 in this.personParams) {
for (let key2 in this.detailData) { for (let key2 in this.detailData) {
if (key1 == key2) { if (key1 == key2) {
this.personParams[key1] = this.detailData[key2]; this.personParams[key1] = this.detailData[key2];
}
} }
} }
this.detailDatalist = this.labelgenerate(this.detailData); }
if (this.personParams.sexRange == "") { this.detailDatalist = this.labelgenerate(this.detailData);
this.personParams.sexRange = "男,女"; if (this.personParams.sexRange == "") {
} this.personParams.sexRange = "男,女";
this.participationParams.activityId = this.detailData.id; }
this.getPersonData(); this.participationParams.activityId = this.detailData.id;
this.getParticipationData(); this.getPersonData();
this.dialogVisible = true; this.getParticipationData();
}); this.dialogVisible = true;
} });
); });
}) })
.catch(() => {}); .catch(() => {});
}, },

@ -26,7 +26,13 @@
<el-table-column label="活动积分" align="center" prop="points" /> <el-table-column label="活动积分" align="center" prop="points" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }} <span
:style="{
color: scope.row.issuanceStatus ? '#67C23A' : '#F56C6C',
}"
>
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

@ -27,7 +27,13 @@
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }} <span
:style="{
color: scope.row.issuanceStatus ? '#67C23A' : '#F56C6C',
}"
>
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

@ -25,7 +25,13 @@
/> />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }} <span
:style="{
color: scope.row.issuanceStatus ? '#67C23A' : '#F56C6C',
}"
>
{{ scope.row.issuanceStatus ? "已发放" : "未发放" }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -91,7 +97,7 @@
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="item-lable">姓名:</div> <div class="item-lable">姓名:</div>
<div class="item-value">{{ form.userName }}</div> <div class="item-value">{{ form.consigneeName }}</div>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="item-lable">手机号:</div> <div class="item-lable">手机号:</div>

Loading…
Cancel
Save