suzhou-jichuang-lanhai
/
volunteer-pc
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

图标修复

Browse Source
dev
许宏杰 2 years ago
parent 71f09d8a60
commit b82c619962
5 changed files with 121 additions and 89 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -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.117:9034' # VUE_APP_BASE_API = 'http://192.168.0.117:9034'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

21
src/views/volunteer/components/invite.vue
Unescape View File

@ -24,7 +24,12 @@
width="70" width="70"
> >
</el-table-column> </el-table-column>
<el-table-column prop="content" label="活动名称" show-overflow-tooltip width="180"> <el-table-column
prop="content"
label="活动名称"
show-overflow-tooltip
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="activity"> <div class="activity">
<div>{{ scope.row.name }}</div> <div>{{ scope.row.name }}</div>
@ -37,7 +42,6 @@
label="活动地址" label="活动地址"
show-overflow-tooltip show-overflow-tooltip
width="100" width="100"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column prop="duration" label="服务时长"> </el-table-column> --> <!-- <el-table-column prop="duration" label="服务时长"> </el-table-column> -->
@ -48,7 +52,12 @@
</div> </div>
</template></el-table-column </template></el-table-column
> >
<el-table-column prop="publisher" label="活动举办方" show-overflow-tooltip> </el-table-column> <el-table-column
prop="publisher"
label="活动举办方"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="activityTime" label="参加时间"> <el-table-column prop="activityTime" label="参加时间">
<template slot-scope="scope"> <template slot-scope="scope">
@ -58,7 +67,9 @@
<el-table-column prop="involveStaus" label="状态"> <el-table-column prop="involveStaus" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="activity"> <div class="activity">
<div>{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}</div> <div>
{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -66,7 +77,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tabs-btns"> <div class="tabs-btns">
<div class="look" @click="look(scope.row)"> <div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" /> <!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span> <span>查看</span>
</div> </div>
<div <div

20
src/views/volunteer/components/recommend.vue
Unescape View File

@ -24,7 +24,12 @@
width="70" width="70"
> >
</el-table-column> </el-table-column>
<el-table-column prop="content" label="活动名称" show-overflow-tooltip width="180"> <el-table-column
prop="content"
label="活动名称"
show-overflow-tooltip
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="activity"> <div class="activity">
<div>{{ scope.row.name }}</div> <div>{{ scope.row.name }}</div>
@ -47,7 +52,12 @@
</div> </div>
</template></el-table-column </template></el-table-column
> >
<el-table-column prop="publisher" label="活动举办方" show-overflow-tooltip> </el-table-column> <el-table-column
prop="publisher"
label="活动举办方"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="activityTime" label="参加时间"> <el-table-column prop="activityTime" label="参加时间">
<template slot-scope="scope"> <template slot-scope="scope">
@ -57,7 +67,9 @@
<el-table-column prop="involveStaus" label="状态"> <el-table-column prop="involveStaus" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="activity"> <div class="activity">
<div>{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}</div> <div>
{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -65,7 +77,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tabs-btns"> <div class="tabs-btns">
<div class="look" @click="look(scope.row)"> <div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" /> <!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span> <span>查看</span>
</div> </div>
<div <div

2
src/views/volunteer/conversionRecord/index.vue
Unescape View File

@ -54,7 +54,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tabs-btns"> <div class="tabs-btns">
<div class="look" @click="look(scope.row)"> <div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" /> <!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span> <span>查看</span>
</div> </div>
</div> </div>

119
src/views/volunteer/integralGain/index.vue
Unescape View File

@ -9,7 +9,11 @@
<template> <template>
<div class="plan-management"> <div class="plan-management">
<div class="plan-topBox"> <div class="plan-topBox">
<my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input> <my-input
@changeInput="changeInput"
placeholder="请输入活动内容"
@changeValue="changeValue"
></my-input>
</div> </div>
<div class="plan-bottomBox"> <div class="plan-bottomBox">
<div class="tables"> <div class="tables">
@ -26,13 +30,10 @@
label="序号" label="序号"
type="index" type="index"
header-align="center" header-align="center"
width="70"> width="70"
</el-table-column>
<el-table-column
prop="name"
label="参与活动"
width="280"
> >
</el-table-column>
<el-table-column prop="name" label="参与活动" width="280">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<div class="activity"> <div class="activity">
<div>{{ scope.row.content.split(' ')[0] }}</div> <div>{{ scope.row.content.split(' ')[0] }}</div>
@ -47,81 +48,89 @@
width="180" width="180"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="activityTime" label="服务活动时长">
prop="activityTime"
label="服务活动时长"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.activityTime.split(' ')[0] }}</div> <div>{{ scope.row.activityTime.split(" ")[0] }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="activityTime" label="参与时间">
prop="activityTime"
label="参与时间"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" width="250">
label="操作"
width="250"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tabs-btns"> <div class="tabs-btns">
<div class="look" @click="look(scope.row)"> <div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt=""> <!-- <img src="@/assets/images/look.png" alt=""> -->
<span>查看</span> <span>查看</span>
</div> </div>
<div class="score">评估评分：<span class="span" :class="Number(scope.row.points) < 60 ? 'pass':''">{{ scope.row.points }}</span></div> <div class="score">
评估评分：<span
class="span"
:class="Number(scope.row.points) < 60 ? 'pass' : ''"
>{{ scope.row.points }}</span
>
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination"> <div class="pagination">
<my-pagination :total="total" @pagesChange="pagesChange"></my-pagination> <my-pagination
:total="total"
@pagesChange="pagesChange"
></my-pagination>
</div> </div>
</div> </div>
<my-dialog ref="conversion" width="45%"> <my-dialog ref="conversion" width="45%">
<el-descriptions class="margin-top" :column="2" border> <el-descriptions class="margin-top" :column="2" border>
<el-descriptions-item label="活动名称">{{ descriptions.name }}</el-descriptions-item> <el-descriptions-item label="活动名称">{{
<el-descriptions-item label="活动时间">{{ descriptions.activityTime }}</el-descriptions-item> descriptions.name
<el-descriptions-item label="活动举办方">{{ descriptions.publisher }}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="积分">{{ descriptions.points }}</el-descriptions-item> <el-descriptions-item label="活动时间">{{
descriptions.activityTime
}}</el-descriptions-item>
<el-descriptions-item label="活动举办方">{{
descriptions.publisher
}}</el-descriptions-item>
<el-descriptions-item label="积分">{{
descriptions.points
}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</my-dialog> </my-dialog>
</div> </div>
</template> </template>
<script> <script>
import myPagination from "@/views/components/myPagination/index.vue" import myPagination from "@/views/components/myPagination/index.vue";
import myInput from "@/views/components/myInput/index.vue" import myInput from "@/views/components/myInput/index.vue";
import myDialog from "@/views/components/dialog/index.vue" import myDialog from "@/views/components/dialog/index.vue";
export default { export default {
components: { myPagination, myInput, myDialog }, components: { myPagination, myInput, myDialog },
data() { data() {
return { return {
tableData: [], tableData: [],
input: { input: {
name:'' name: "",
}, },
pages: { pages: {
pageSize: 10, pageSize: 10,
pageNum:1 pageNum: 1,
}, },
total: 0, total: 0,
loading: false, loading: false,
isClick: false, isClick: false,
descriptions: { descriptions: {
name:'', name: "",
activityTime:'', activityTime: "",
publisher:'', publisher: "",
points:'' points: "",
}, },
} };
}, },
methods: { methods: {
// 页码，当前页切换事件 // 页码，当前页切换事件
pagesChange(pages) { pagesChange(pages) {
// console.log(pages) // console.log(pages)
this.getList(pages) this.getList(pages);
}, },
// 输入框的值 // 输入框的值
changeInput(value) { changeInput(value) {
@ -135,8 +144,8 @@ export default {
}, },
// 监听输入框是否清空 // 监听输入框是否清空
changeValue(value) { changeValue(value) {
if(this.isClick && value == ''){ if (this.isClick && value == "") {
this.input.name = ''; this.input.name = "";
this.pages = { this.pages = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -157,7 +166,7 @@ export default {
if (columnIndex === 0) { if (columnIndex === 0) {
return `text-align:center`; return `text-align:center`;
} else { } else {
return ''; return "";
} }
}, },
// 查看详情页 // 查看详情页
@ -169,14 +178,14 @@ export default {
name, name,
activityTime, activityTime,
publisher, publisher,
points points,
}; };
console.log(data) console.log(data);
}, },
// 积分获取列表 // 积分获取列表
async getList() { async getList() {
this.loading = true; this.loading = true;
let obj = { ...this.pages,...this.input } let obj = { ...this.pages, ...this.input };
let data = await this.$api.jifenhuoqu.selectall(obj); let data = await this.$api.jifenhuoqu.selectall(obj);
if (data.code == 200) { if (data.code == 200) {
this.loading = false; this.loading = false;
@ -188,7 +197,7 @@ export default {
mounted() { mounted() {
this.getList(); this.getList();
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.plan-management { .plan-management {
@ -214,14 +223,14 @@ export default {
line-height: 20px; line-height: 20px;
&:nth-child(1) { &:nth-child(1) {
font-size: 14px; font-size: 14px;
font-family: 'Alibaba PuHuiTi'; font-family: "Alibaba PuHuiTi";
font-weight: 400; font-weight: 400;
color: #4D4949; color: #4d4949;
} }
&:nth-child(2) { &:nth-child(2) {
width: 180px; width: 180px;
font-size: 14px; font-size: 14px;
font-family: 'Alibaba PuHuiTi'; font-family: "Alibaba PuHuiTi";
font-weight: 400; font-weight: 400;
color: #999191; color: #999191;
white-space: nowrap; white-space: nowrap;
@ -235,18 +244,18 @@ export default {
box-sizing: border-box; box-sizing: border-box;
// text-align: center; // text-align: center;
font-size: 14px; font-size: 14px;
font-family: 'Alibaba PuHuiTi'; font-family: "Alibaba PuHuiTi";
font-weight: 400; font-weight: 400;
color: #525966; color: #525966;
padding: 2px 0; padding: 2px 0;
} }
th { th {
height: 45px; height: 45px;
background-color: #F7F5F5; background-color: #f7f5f5;
font-size: 15px; font-size: 15px;
font-family: 'Alibaba PuHuiTi'; font-family: "Alibaba PuHuiTi";
font-weight: bold; font-weight: bold;
color: #4D4949; color: #4d4949;
.el-checkbox { .el-checkbox {
display: none; display: none;
} }
@ -272,15 +281,15 @@ export default {
font-size: 15px; font-size: 15px;
font-family: Alibaba PuHuiTi; font-family: Alibaba PuHuiTi;
font-weight: 400; font-weight: 400;
color: #045FFD; color: #045ffd;
} }
} }
.score { .score {
.span { .span {
color: #2AA984; color: #2aa984;
} }
.pass { .pass {
color: #F38447; color: #f38447;
} }
} }
} }

Write Preview
Loading…
Cancel
Save