diff --git a/.env.development b/.env.development index d493e8d..1b91af0 100644 --- a/.env.development +++ b/.env.development @@ -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 diff --git a/.env.production b/.env.production index 2143b78..3ac36c2 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 志愿者管理系统 +VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台 # 生产环境配置 ENV = 'production' -# 志愿者管理系统/生产环境 +# 苏州园区志愿服务活动区块链平台/生产环境 VUE_APP_BASE_API = 'http://39.101.188.84:9034' diff --git a/.env.staging b/.env.staging index a38ef25..1a6570c 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 志愿者管理系统 +VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 志愿者管理系统/测试环境 +# 苏州园区志愿服务活动区块链平台/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/package.json b/package.json index 7c32c0c..52afe8a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.8.6", - "description": "志愿者管理系统", + "description": "苏州园区志愿服务活动区块链平台", "author": "若依", "license": "MIT", "scripts": { diff --git a/src/api/volunteer/gxhzs/hdzsff/index.js b/src/api/volunteer/gxhzs/hdzsff/index.js index 3b8eca2..d1b991a 100644 --- a/src/api/volunteer/gxhzs/hdzsff/index.js +++ b/src/api/volunteer/gxhzs/hdzsff/index.js @@ -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, + }); +} diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg index 8a89eb8..58c5129 100644 Binary files a/src/assets/images/login-background.jpg and b/src/assets/images/login-background.jpg differ diff --git a/src/assets/styles/myTable.scss b/src/assets/styles/myTable.scss index d385823..d5ed46d 100644 --- a/src/assets/styles/myTable.scss +++ b/src/assets/styles/myTable.scss @@ -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; + } +} diff --git a/src/store/getters.js b/src/store/getters.js index 51599c9..960e9fc 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -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, diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 8466672..cae3194 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,6 @@ const permission = { state.sidebarRouters = routes; }, SET_INTEGRAL: (state, integral) => { - console.log(integral, "aaaa"); state.integral = integral; }, }, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index eda05fc..6d9517d 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -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); }) diff --git a/src/views/login.vue b/src/views/login.vue index e124a76..ef8445d 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -6,7 +6,7 @@ :rules="loginRules" class="login-form" > -

志愿者管理系统

+

苏州园区志愿服务活动区块链平台

- - + + - - + + - - + + - 提 交 + 提 交 diff --git a/src/views/volunteer/gxhzs/gxhzsdh/index.vue b/src/views/volunteer/gxhzs/gxhzsdh/index.vue index 21f97c5..e779c70 100644 --- a/src/views/volunteer/gxhzs/gxhzsdh/index.vue +++ b/src/views/volunteer/gxhzs/gxhzsdh/index.vue @@ -83,9 +83,7 @@ export default { }, /**兑换 */ conversion(item) { - // console.log(item); let data = { - address: "测试地址", certificateId: item.id, type: 0, }; diff --git a/src/views/volunteer/gxhzs/gxhzsff/index.vue b/src/views/volunteer/gxhzs/gxhzsff/index.vue index 599c45e..1a456fb 100644 --- a/src/views/volunteer/gxhzs/gxhzsff/index.vue +++ b/src/views/volunteer/gxhzs/gxhzsff/index.vue @@ -1,25 +1,10 @@