问题修复

lijinlong
许宏杰 1 year ago
parent 8dcb3ca748
commit ab47afa61c

@ -1,13 +1,13 @@
# 页面标题
VUE_APP_TITLE = 志愿者管理系统
VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台
# 开发环境配置
ENV = 'development'
# 志愿者管理系统/开发环境
# 苏州园区志愿服务活动区块链平台/开发环境
# 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://192.168.0.117:9034'
# VUE_APP_BASE_API = 'http://39.101.188.84:9034'
VUE_APP_BASE_API = 'http://192.168.0.117:9034'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -1,8 +1,8 @@
# 页面标题
VUE_APP_TITLE = 志愿者管理系统
VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台
# 生产环境配置
ENV = 'production'
# 志愿者管理系统/生产环境
# 苏州园区志愿服务活动区块链平台/生产环境
VUE_APP_BASE_API = 'http://39.101.188.84:9034'

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 志愿者管理系统
VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
# 志愿者管理系统/测试环境
# 苏州园区志愿服务活动区块链平台/测试环境
VUE_APP_BASE_API = '/stage-api'

@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.6",
"description": "志愿者管理系统",
"description": "苏州园区志愿服务活动区块链平台",
"author": "若依",
"license": "MIT",
"scripts": {

@ -39,3 +39,18 @@ export function dsbrecordsList(query) {
params: query,
});
}
//获取兑换记录详细信息
export function dsbrecordsInfo(id) {
return request({
url: "/zhiyuanzhe/dsbrecords/" + id,
method: "get",
});
}
//发放个性化证书
export function issue(data) {
return request({
url: "/zhiyuanzhe/dsbrecords/issue",
method: "post",
data,
});
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 KiB

After

Width:  |  Height:  |  Size: 667 KiB

@ -87,7 +87,7 @@
right: 7%;
font-size: 18px;
font-weight: bold;
color: #2aa984;
color: $--color-primary;
z-index: 10;
font-family: "din-bold-2.ttf";
}
@ -142,3 +142,58 @@
align-items: center;
justify-content: center;
}
//
::v-deep .conversionInfo {
.basicInfo,
.logisticsInfo {
.title {
display: flex;
align-items: center;
img {
width: 14px;
margin-right: 10px;
}
span {
font-size: 16px;
font-family: "Alibaba PuHuiTi";
font-weight: bold;
color: #4c4949;
}
}
.info {
margin-top: 20px;
display: grid;
grid-column: 1fr;
grid-row-gap: 20px;
.lists {
display: flex;
align-items: center;
justify-content: space-between;
.list-left,
.list-right {
flex: 1;
display: flex;
align-items: center;
div {
&:nth-child(1) {
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #4c4949;
}
&:nth-child(2) {
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #807a7a;
}
}
}
}
}
}
.logisticsInfo {
margin-top: 30px;
}
}

@ -8,6 +8,7 @@ const getters = {
token: (state) => state.user.token,
avatar: (state) => state.user.avatar,
name: (state) => state.user.name,
userId: (state) => state.user.userId,
introduction: (state) => state.user.introduction,
roles: (state) => state.user.roles,
permissions: (state) => state.user.permissions,

@ -31,7 +31,6 @@ const permission = {
state.sidebarRouters = routes;
},
SET_INTEGRAL: (state, integral) => {
console.log(integral, "aaaa");
state.integral = integral;
},
},

@ -5,6 +5,7 @@ const user = {
state: {
token: getToken(),
name: "",
userId: "",
avatar: "",
roles: [],
permissions: [],
@ -17,6 +18,9 @@ const user = {
SET_NAME: (state, name) => {
state.name = name;
},
SET_USER_ID: (state, userId) => {
state.userId = userId;
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar;
},
@ -66,6 +70,7 @@ const user = {
commit("SET_ROLES", ["ROLE_DEFAULT"]);
}
commit("SET_NAME", user.nickName);
commit("SET_USER_ID", user.userId);
commit("SET_AVATAR", avatar);
resolve(res);
})

@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
<h3 class="title">志愿者管理系统</h3>
<h3 class="title">苏州园区志愿服务活动区块链平台</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"

@ -7,31 +7,57 @@
label-width="80px"
class="user-address"
>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name"></el-input>
<el-form-item label="姓名" prop="nickName">
<el-input v-model="form.nickName" readonly></el-input>
</el-form-item>
<el-form-item label="手机号" prop="name">
<el-input v-model="form.name"></el-input>
<el-form-item label="手机号" prop="phonenumber">
<el-input v-model="form.phonenumber" readonly></el-input>
</el-form-item>
<el-form-item label="详细地址" prop="name">
<el-input v-model="form.name" type="textarea" :rows="3"></el-input>
<el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" type="textarea" :rows="3"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary"> </el-button>
<el-button type="primary" @click="handleSubmit()"> </el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import { getUserProfile, updateUserProfile } from "@/api/system/user.js";
export default {
data() {
return {
form: {},
rules: {},
rules: {
address: [
{ required: true, message: "请输入详细地址", trigger: "blur" },
],
},
};
},
methods: {},
created() {
this.getUserInfo();
},
methods: {
getUserInfo() {
getUserProfile().then((res) => {
this.form = res.data;
console.log(this.form, res);
});
},
handleSubmit() {
this.$refs["form"].validate((valid) => {
if (valid) {
updateUserProfile(this.form).then(() => {
this.$modal.msgSuccess("提交成功");
});
} else {
return false;
}
});
},
},
};
</script>

@ -83,9 +83,7 @@ export default {
},
/**兑换 */
conversion(item) {
// console.log(item);
let data = {
address: "测试地址",
certificateId: item.id,
type: 0,
};

@ -1,25 +1,10 @@
<template>
<div class="app-container" ref="main">
<div ref="search">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
class="search-container"
>
<el-form-item prop="name">
<el-input
v-model="queryParams.input"
placeholder="请输入关键字"
clearable
>
<div class="search-btn" slot="append">
<i class="el-icon-search"></i>
</div>
</el-input>
</el-form-item>
</el-form>
<MyInput
v-model="queryParams.certificateName"
@clickSearch="handleSearch"
/>
</div>
<el-table
@ -34,7 +19,7 @@
prop="id"
width="55"
/>
<el-table-column label="证书名称" align="center" prop="certificateId" />
<el-table-column label="证书名称" align="center" prop="certificateName" />
<el-table-column label="志愿者" align="center" prop="userName" />
<el-table-column label="兑换时间" align="center" prop="createTime" />
<el-table-column label="状态" align="center" prop="status">
@ -48,7 +33,9 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button size="mini" type="text">查看</el-button>
<el-button size="mini" type="text" @click="handleInfo(scope.row)"
>查看</el-button
>
<el-button
size="mini"
type="text"
@ -81,7 +68,7 @@
</div>
<div class="info-item">
<div class="item-lable">证书名称:</div>
<div class="item-value">{{ form.certificateId }}</div>
<div class="item-value">{{ form.certificateName }}</div>
</div>
<div class="info-item">
<div class="item-lable">志愿者:</div>
@ -103,40 +90,44 @@
</div>
<div class="info-item">
<div class="item-lable">姓名:</div>
<div class="item-value"></div>
<div class="item-value">{{ form.userName }}</div>
</div>
<div class="info-item">
<div class="item-lable">手机号:</div>
<div class="item-value"></div>
<div class="item-value">{{ form.phonenumber }}</div>
</div>
<div class="info-item">
<div class="item-lable">详细地址:</div>
<div class="item-value"></div>
<div class="item-value">{{ form.address }}</div>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
<el-button type="warning" @click="submitPaper"></el-button>
<el-button type="primary" @click="submitElectron"
<el-button type="warning" @click="submitPaper()"
>发放纸制证书</el-button
>
<el-button type="primary" @click="submitElectron()"
>发放电子证书</el-button
>
</div>
</el-dialog>
<!-- 证书 -->
<!-- 证书 -->
<el-dialog :visible.sync="infoOpen" width="500px" append-to-body>
<div slot="title" class="dialog-title">
<span class="title-line"></span>
邮政信息
</div>
<!-- <Editor v-model="form.content" :min-height="192" /> -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="快递公司" prop="name">
<el-input v-model="form.name" placeholder="请输入快递公司" />
<el-form-item label="快递公司" prop="courierCompanies">
<el-input
v-model="form.courierCompanies"
placeholder="请输入快递公司"
/>
</el-form-item>
<el-form-item label="快递单号" prop="serviceDuration">
<el-form-item label="快递单号" prop="trackingNumber">
<el-input
v-model="form.serviceDuration"
v-model="form.trackingNumber"
placeholder="请输入快递公司"
/>
</el-form-item>
@ -145,25 +136,100 @@
<el-button type="primary" @click="submitForm"> </el-button>
</div>
</el-dialog>
<!-- 查看 -->
<el-dialog :visible.sync="infoShow" width="600px" append-to-body>
<div slot="title" class="dialog-title">
<span class="title-line"></span>
查看
</div>
<div class="conversionInfo">
<div class="basicInfo">
<div class="title">
<img src="@/assets/images/huodong.png" alt="" />
<span>证书详情</span>
</div>
<div class="info">
<div class="lists">
<div class="list-left">
<div>证书名称</div>
<div>{{ form.certificateName }}</div>
</div>
<div class="list-right">
<div>志愿者</div>
<div>{{ form.userName }}</div>
</div>
</div>
<div class="lists">
<div class="list-left">
<div>兑换时间</div>
<div>{{ form.createTime }}</div>
</div>
<div class="list-left">
<div>状态</div>
<div>{{ form.status == 1 ? "已发放" : "未发放" }}</div>
</div>
</div>
</div>
</div>
<div class="logisticsInfo" v-show="form.type == 2">
<div class="title">
<img src="@/assets/images/huodong.png" alt="" />
<span>纸制证书</span>
</div>
<div class="info">
<div class="lists">
<div class="list-left">
<div>快递公司</div>
<div>{{ form.courierCompanies }}</div>
</div>
<div class="list-right">
<div>快递单号</div>
<div>{{ form.trackingNumber }}</div>
</div>
</div>
</div>
</div>
<div class="logisticsInfo" v-show="form.type == 1">
<div class="title">
<img src="@/assets/images/huodong.png" alt="" />
<span>电子证书</span>
</div>
<div class="info"></div>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { dsbrecordsList } from "@/api/volunteer/gxhzs/hdzsff/index.js";
import {
dsbrecordsList,
dsbrecordsInfo,
issue,
} from "@/api/volunteer/gxhzs/hdzsff/index.js";
export default {
data() {
return {
infoShow: false,
infoOpen: false,
form: {},
rules: {},
rules: {
courierCompanies: [
{ required: true, message: "请输入快递公司", trigger: "blur" },
],
trackingNumber: [
{ required: true, message: "请输入快递公司", trigger: "blur" },
],
},
open: false,
title: "",
tableHeigth: 0,
queryParams: {},
loading: false,
tableData: [],
total: 1,
queryParams: {
certificateName: undefined,
creType: 2, //1:,2
pageNum: 1,
pageSize: 20,
},
@ -178,29 +244,86 @@ export default {
});
},
methods: {
/**纸质提交 */
submitForm() {
editData(this.form).then((res) => {
this.submitElectron();
});
/**搜索 */
handleSearch(keyWord) {
this.queryParams = {
certificateName: keyWord,
creType: 2, //1:,2
pageNum: 1,
pageSize: 10,
};
this.getList();
},
/**查详情 */
async handleInfo(row) {
let res = await this.getInfo(row.id);
this.form = res.data;
this.infoShow = true;
// console.log("", res);
},
async getInfo(id) {
let res = await dsbrecordsInfo(id);
return res;
},
/**纸质 */
//
async handleFabu(row) {
this.reset();
let res = await this.getInfo(row.id);
this.form = res.data;
this.title = "发放查看";
this.open = true;
},
//
isComplete() {
if (!this.form.userName || !this.form.address || !this.form.phonenumber) {
this.$modal.msgError("请前往地址管理中添加详细地址!");
return false;
} else {
return true;
}
},
/**纸制 */
submitPaper() {
this.infoOpen = true;
let isTrue = this.isComplete();
if (isTrue) {
this.infoOpen = true;
}
},
/**电子 */
submitElectron() {
let data = {
activityId: this.form.activityId,
uid: this.form.uid,
};
postElectron(data).then((res) => {
/**纸制提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
let data = {
courierCompanies: this.form.courierCompanies,
id: this.form.id,
trackingNumber: this.form.trackingNumber,
type: 2, // 1: 2:
};
this.subIssue(data);
});
},
//
subIssue(data) {
issue(data).then((res) => {
this.infoOpen = false;
this.open = false;
this.$modal.msgSuccess("发放成功");
this.getList();
this.$modal.msgSuccess("发放成功");
});
},
/**电子 */
submitElectron() {
let _this = this;
this.$modal
.confirm(`您确定要发放“${this.form.certificateName}”证书吗?`)
.then(function () {
let data = {
id: _this.form.id,
type: 1, // 1: 2:
};
_this.subIssue(data);
});
},
/**关闭 */
cancel() {
this.open = false;
@ -235,18 +358,6 @@ export default {
this.loading = false;
});
},
handleFabu(row) {
this.title = "发放查看";
this.open = true;
// this.reset();
// let id = row.id;
// getInfo(id).then((res) => {
// this.form = res.data;
// this.title = "";
// this.open = true;
// });
},
},
};
</script>

@ -106,13 +106,13 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
<el-button type="warning" @click="submitPaper"></el-button>
<el-button type="warning" @click="submitPaper"></el-button>
<el-button type="primary" @click="submitElectron"
>发放电子证书</el-button
>
</div>
</el-dialog>
<!-- 证书 -->
<!-- 证书 -->
<el-dialog :visible.sync="infoOpen" width="500px" append-to-body>
<div slot="title" class="dialog-title">
<span class="title-line"></span>
@ -161,13 +161,13 @@ export default {
});
},
methods: {
/**纸提交 */
/**纸提交 */
submitForm() {
editData(this.form).then((res) => {
this.submitElectron();
});
},
/**纸 */
/**纸 */
submitPaper() {
this.infoOpen = true;
},

@ -1,59 +1,41 @@
<template>
<div class="app-container" ref="main">
<div ref="search">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
class="search-container"
>
<el-form-item prop="name">
<el-input
v-model="queryParams.input"
placeholder="请输入关键字"
clearable
>
<div class="search-btn" slot="append">
<i class="el-icon-search"></i>
</div>
</el-input>
</el-form-item>
</el-form>
<div ref="search" class="search">
<MyInput v-model="queryParams.name" @clickSearch="handleSearch" />
</div>
<el-table
v-loading="loading"
:data="tableData"
:height="tableHeigth + 'px'"
>
<el-table-column
label="序号"
align="center"
type="index"
prop="id"
width="55"
/>
<el-table-column label="证书名称" align="center" prop="certificateId" />
<el-table-column label="志愿者" align="center" prop="type" />
<el-table-column label="状态" align="center" prop="duration" />
<el-table-column label="兑换时间" align="center" prop="time" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
<ul class="book-main" :style="listStyle" v-if="certificatesList.length > 0">
<li
v-for="(item, index) in certificatesList"
:key="item.id"
:style="{ marginBottom: isLastRow(index) ? '0px' : '' }"
>
<template slot-scope="scope">
<el-button
size="mini"
icon="el-icon-view"
type="text"
@click="handleInfo(scope.row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<el-image
style="width: 100%; height: 87%"
:src="baseUrl + item.cover"
fit="fill"
>
</el-image>
<div class="operate">
<div class="integral">
{{ item.certificateName }}
</div>
<div class="operate-child">
<el-button
type="text"
size="mini"
style="color: #909399"
@click="handleInfo(item)"
>查看</el-button
>
</div>
</div>
</li>
</ul>
<div v-if="certificatesList.length == 0" :style="listStyle" class="noData">
<el-empty description="暂无证书"></el-empty>
</div>
<pagination
v-show="total > 0"
:total="total"
@ -61,12 +43,11 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 发布对话框 -->
<el-dialog :visible.sync="open" width="900px" append-to-body>
<!-- 查看 -->
<el-dialog :visible.sync="infoShow" width="600px" append-to-body>
<div slot="title" class="dialog-title">
<span class="title-line"></span>
{{ title }}
查看
</div>
<div class="conversionInfo">
<div class="basicInfo">
@ -78,53 +59,50 @@
<div class="lists">
<div class="list-left">
<div>证书名称</div>
<div>xxx证书</div>
<div>{{ form.certificateName }}</div>
</div>
<div class="list-right">
<div>志愿者</div>
<div>xxxx</div>
<div>{{ form.userName }}</div>
</div>
</div>
<div class="lists">
<div class="list-left">
<div>兑换时间</div>
<div>xxxx</div>
</div>
<div class="list-left">
<div>兑换积分</div>
<div>xx</div>
<div>{{ form.createTime }}</div>
</div>
</div>
<div class="lists">
<div class="list-left">
<div>证书状态</div>
<div>已发放</div>
<div>状态</div>
<div>{{ form.status == 1 ? "已发放" : "未发放" }}</div>
</div>
</div>
</div>
</div>
<div class="logisticsInfo">
<div class="logisticsInfo" v-show="form.type == 2">
<div class="title">
<img src="@/assets/images/huodong.png" alt="" />
<span>物流信息</span>
<span>纸制证书</span>
</div>
<div class="info">
<div class="lists">
<div class="list-left">
<div>快递公司</div>
<div>XXXXXXXXX</div>
<div>{{ form.courierCompanies }}</div>
</div>
<div class="list-right">
<div>快递单号</div>
<div>XXXXXXXXXXX</div>
<div>{{ form.trackingNumber }}</div>
</div>
</div>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
<div class="logisticsInfo" v-show="form.type == 1">
<div class="title">
<img src="@/assets/images/huodong.png" alt="" />
<span>电子证书</span>
</div>
<div class="info"></div>
</div>
</div>
</el-dialog>
</div>
@ -132,102 +110,86 @@
<script>
import {
getSellectall,
postElectron,
getInfo,
editData,
dsbrecordsList,
dsbrecordsInfo,
} from "@/api/volunteer/gxhzs/hdzsff/index.js";
export default {
data() {
return {
infoOpen: false,
form: {},
open: false,
title: "",
tableHeigth: 0,
queryParams: {},
listStyle: {
height: 0,
overflowY: "auto",
},
infoShow: false,
baseUrl: process.env.VUE_APP_BASE_API,
certificatesList: [],
loading: false,
tableData: [{}],
total: 1,
tableData: [],
total: 0,
queryParams: {
creType: 2,
status: 1,
UId: undefined,
certificateName: undefined,
pageNum: 1,
pageSize: 20,
pageSize: 10,
},
form: {},
rules: {},
};
},
created() {
this.queryParams.UId = this.$store.getters.userId;
// //
this.$nextTick(() => {
this.tableHeigth =
this.$refs.main.offsetHeight - this.$refs.search.offsetHeight - 80;
this.listStyle.height =
this.$refs.main.offsetHeight -
40 -
this.$refs.search.offsetHeight -
42 +
"px";
this.getList();
});
},
methods: {
handleInfo() {
this.title = "查看";
this.open = true;
isLastRow(index) {
const rowCount = Math.ceil(this.certificatesList.length / 5);
const row = Math.floor(index / 5);
return row === rowCount - 1;
},
/**搜索 */
handleSearch(keyWord) {
this.queryParams = {
status: 1,
UId: this.$store.getters.userId,
certificateName: keyWord,
pageNum: 1,
pageSize: 10,
};
this.getList();
},
/** 查询证书管理列表 */
getList() {
this.loading = true;
dsbrecordsList(this.queryParams).then((response) => {
this.certificatesList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/**查看 */
/**查详情 */
async handleInfo(row) {
let res = await this.getInfo(row.id);
this.form = res.data;
this.infoShow = true;
},
cancel() {
this.open = false;
async getInfo(id) {
let res = await dsbrecordsInfo(id);
return res;
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/styles/myTable.scss";
::v-deep .conversionInfo {
.basicInfo,
.logisticsInfo {
.title {
display: flex;
align-items: center;
img {
width: 14px;
margin-right: 10px;
}
span {
font-size: 16px;
font-family: "Alibaba PuHuiTi";
font-weight: bold;
color: #4c4949;
}
}
.info {
margin-top: 20px;
display: grid;
grid-column: 1fr;
grid-row-gap: 20px;
.lists {
display: flex;
align-items: center;
justify-content: space-between;
.list-left,
.list-right {
flex: 1;
display: flex;
align-items: center;
div {
&:nth-child(1) {
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #4c4949;
}
&:nth-child(2) {
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #807a7a;
}
}
}
}
}
}
.logisticsInfo {
margin-top: 30px;
}
}
</style>

@ -119,13 +119,13 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
<el-button type="warning" @click="submitPaper"></el-button>
<el-button type="warning" @click="submitPaper"></el-button>
<el-button type="primary" @click="submitElectron"
>发放电子证书</el-button
>
</div>
</el-dialog>
<!-- 证书 -->
<!-- 证书 -->
<el-dialog :visible.sync="infoOpen" width="500px" append-to-body>
<div slot="title" class="dialog-title">
<span class="title-line"></span>
@ -186,13 +186,13 @@ export default {
});
},
methods: {
/**纸提交 */
/**纸提交 */
submitForm() {
editData(this.form).then((res) => {
this.submitElectron();
});
},
/**纸 */
/**纸 */
submitPaper() {
this.infoOpen = true;
},

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require("compression-webpack-plugin");
const name = process.env.VUE_APP_TITLE || "志愿者管理系统"; // 网页标题
const name = process.env.VUE_APP_TITLE || "苏州园区志愿服务活动区块链平台"; // 网页标题
const port = process.env.port || process.env.npm_config_port || 80; // 端口

Loading…
Cancel
Save