master
Tuzki 1 year ago
parent 6e930612de
commit d0a7bc0fcf
  1. 5
      ruoyi-ui/src/api/login.js
  2. BIN
      ruoyi-ui/src/assets/images/banner2@2x.png
  3. BIN
      ruoyi-ui/src/assets/images/pc-bg.png
  4. BIN
      ruoyi-ui/src/assets/images/pc-dwmo@2x.png
  5. BIN
      ruoyi-ui/src/assets/images/pc-dwtb@2x.png
  6. BIN
      ruoyi-ui/src/assets/images/pc-grmo@2x.png
  7. BIN
      ruoyi-ui/src/assets/images/pc-grtb@2x.png
  8. BIN
      ruoyi-ui/src/assets/images/pc-yao@2x.png
  9. BIN
      ruoyi-ui/src/assets/images/pc-zu1.png
  10. BIN
      ruoyi-ui/src/assets/images/pc-zu2.png
  11. BIN
      ruoyi-ui/src/assets/images/pc-zu3.png
  12. BIN
      ruoyi-ui/src/assets/images/pc-zu4.png
  13. 37
      ruoyi-ui/src/views/h5/guider/index.vue
  14. 5
      ruoyi-ui/src/views/h5/member/index.vue
  15. 5
      ruoyi-ui/src/views/h5/personalmember/index.vue
  16. 274
      ruoyi-ui/src/views/h5/welcome.vue
  17. 2
      ruoyi-ui/src/views/system/member/index.vue
  18. 2
      ruoyi-ui/src/views/system/personalmember/index.vue

@ -75,9 +75,10 @@ export function getForgetThePasswordVerificationCode(val) {
})
}
//忘记密码提交
export function forgetThePassword() {
export function forgetThePassword(data) {
return request({
url: '/system/user/forgetThePassword',
method: 'post'
method: 'post',
data: data
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

@ -26,10 +26,18 @@
<div class="m-qr-box">
<div class="title">河北省非物质文化遗产保护协会欢迎您</div>
<div class="m-qr">
<img alt="" class="qr" src="../../../assets/images/qr1.png">
<img @click="goRotue(1)" alt="" class="qr" src="../../../assets/images/pc-zu1.png">
</img>
<img @click="goRotue(2)" alt="" class="qr" src="../../../assets/images/pc-zu2.png">
</img>
</div>
<div class="m-qr">
<img @click="goRotue(3)" alt="" class="qr" src="../../../assets/images/pc-zu3.png">
</img>
<img @click="goRotue(4)" alt="" class="qr" src="../../../assets/images/pc-zu4.png">
</img>
</div>
<div class="m-tips">请扫码了解详情</div>
<div class="m-tips">协会联系电话8787060487024648转82068066</div>
</div>
</div>
</div>
@ -140,13 +148,12 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../../../assets/images/login-backimg.png");
background-image: url("../../../assets/images/pc-bg.png");
background-size: cover;
.m-qr-box {
width: 538px;
height: 632px;
background-image: url("../../../assets/images/qrcode-bg@2x.png");
width: 100%;
max-width: 1200px;
background-size: cover;
.title {
@ -156,21 +163,29 @@ export default {
color: #723233;
line-height: 45px;
text-align: center;
margin-top: 80px;
}
.m-qr {
width: 234px;
height: 234px;
background-image: url("../../../assets/images/qrcode-bd@2x.png");
width: 100%;
height: 192px;
display: flex;
justify-content: space-between;
background-size: cover;
text-align: center;
margin: 0 auto;
margin-top: 80px;
.qr {
width: 90%;
width: 540px;
margin-top: 15px;
transition: all ease-in-out 0.5s;
cursor: pointer;
opacity: 0.8;
}
.qr:hover{
scale: 1.1;
opacity: 1;
}
}

@ -548,11 +548,13 @@ export default {
padding: 10px;
padding-bottom: 70px;
background-color: #F4EACF;
text-align: center;
.m-form {
padding: 30px 15px;
border-radius: 10px;
background-color: rgba(255,255,255,0.9);
max-width: 1200px;
margin: 0 auto;
.titles{
text-align: center;
@ -587,6 +589,7 @@ export default {
background-color: #723233;
border: none;
color: #fff;
max-width: 500px;
}
}
.m-radio-group{

@ -631,11 +631,15 @@ export default {
padding: 10px;
padding-bottom: 70px;
background-color: #F4EACF;
text-align: center;
.m-form {
padding: 30px 15px;
border-radius: 10px;
background-color: rgba(255, 255, 255, 0.9);
max-width: 1200px;
margin: 0 auto;
text-align: left;
.titles {
text-align: center;
@ -684,6 +688,7 @@ export default {
background-color: #723233;
border: none;
color: #fff;
max-width: 500px;
}
}

@ -1,37 +1,69 @@
<template>
<div class="m-box-F">
<div class="m-banner-box">
<img class="img" src="../../assets/images/banner.png" alt="">
</div>
<div class="m-intro-box" @click="goIntro">
<div class="m-left-intro">
<img class="img" src="../../assets/images/intro_left.png" alt="">
<span class="btn-text">会员邀请函</span>
<div :class="heckIsMobile()?'m-box-F':'m-box-P'">
<div class="mobile-box-F" v-if="heckIsMobile()">
<div class="m-banner-box">
<img alt="" class="img" src="../../assets/images/banner.png">
</div>
<img class="img" src="../../assets/images/intro_right.png" alt="">
</div>
<div class="m-title">模板下载</div>
<div class="btn-box">
<div class="btn red" @click="downloadDoc(1)">
<img class="img" src="../../assets/images/qiye_mo.png" alt="">
<span class="btn-text"> / / / </span>
<div class="m-intro-box" @click="goIntro">
<div class="m-left-intro">
<img alt="" class="img" src="../../assets/images/intro_left.png">
<span class="btn-text">会员邀请函</span>
</div>
<img alt="" class="img" src="../../assets/images/intro_right.png">
</div>
<div class="m-title">模板下载</div>
<div class="btn-box">
<div class="btn red" @click="downloadDoc(1)">
<img alt="" class="img" src="../../assets/images/qiye_mo.png">
<span class="btn-text"> / / / </span>
</div>
<div class="btn grown" @click="downloadDoc(2)">
<img alt="" class="img" src="../../assets/images/geren_mo.png">
<span class="btn-text"> / / / </span>
</div>
</div>
<div class="btn grown" @click="downloadDoc(2)">
<img class="img" src="../../assets/images/geren_mo.png" alt="">
<span class="btn-text"> / / / </span>
<div class="m-title">信息填报</div>
<div class="btn-box">
<div class="btn blue" @click="formCom">
<img alt="" class="img" src="../../assets/images/qiye_tian.png">
<span class="btn-text"> / / / </span>
</div>
<div class="btn green" @click="formPer">
<img alt="" class="img" src="../../assets/images/geren_tian.png">
<span class="btn-text"> / / / </span>
</div>
</div>
</div>
<div class="m-title">信息填报</div>
<div class="btn-box">
<div class="btn blue" @click="formCom">
<img class="img" src="../../assets/images/qiye_tian.png" alt="">
<span class="btn-text"> / / / </span>
<div class="pc-box-F" v-if="!heckIsMobile()">
<div class="title">
河北省非物质文化遗产保护协会欢迎您~
</div>
<div class="btn green" @click="formPer">
<img class="img" src="../../assets/images/geren_tian.png" alt="">
<span class="btn-text"> / / / </span>
<div class="m-content">
<div class="content-left">
<img @click="goIntro" alt="" class="img" src="../../assets/images/pc-yao@2x.png">
</div>
<div class="content-right">
<div class="content-right-top">
<div class="content-title">模板下载</div>
<div class="content-btns">
<img @click="downloadDoc(1)" class="img" src="../../assets/images/pc-dwmo@2x.png" alt="">
<img @click="downloadDoc(2)" class="img" src="../../assets/images/pc-grmo@2x.png" alt="">
</div>
</div>
<div class="content-right-top">
<div class="content-title">信息填报</div>
<div class="content-btns">
<img @click="formCom" class="img" src="../../assets/images/pc-dwtb@2x.png" alt="">
<img @click="formPer" class="img" src="../../assets/images/pc-grtb@2x.png" alt="">
</div>
</div>
</div>
</div>
<div class="m-feet">
协会联系电话8787060487024648转82068066
</div>
</div>
<el-dialog
:before-close="handleClose"
:visible.sync="dialogVisible"
@ -48,13 +80,14 @@
import axios from 'axios';
import {listMember} from "@/api/system/member";
import {listPersonalmember} from "@/api/system/personalmember";
export default {
name: "welcome",
data() {
return {
dialogVisible: true,
memberList:[],
personalmemberList:[],
memberList: [],
personalmemberList: [],
//
queryParams1: {
pageNum: 1,
@ -112,15 +145,25 @@ export default {
this.getList();
const once = window.localStorage.getItem('once')
if (once && once == '1'){
if (once && once == '1') {
this.dialogVisible = false
}
setTimeout(()=>{
setTimeout(() => {
this.handleClose()
},3000)
}, 3000)
},
methods:{
methods: {
heckIsMobile() {
const userAgentInfo = navigator.userAgent;
const mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
for (let i = 0; i < mobileAgents.length; i++) {
if (userAgentInfo.indexOf(mobileAgents[i]) > 0) {
return true;
}
}
return false;
},
/** 查询单位会员列表 */
getList1() {
this.loading = true;
@ -135,15 +178,15 @@ export default {
this.personalmemberList = response.rows;
});
},
handleClose(){
handleClose() {
this.dialogVisible = false
window.localStorage.setItem('once','1')
window.localStorage.setItem('once', '1')
},
async downloadDoc(val) {
let response = ''
try {
if (val == 1){
response = await axios.get('/doc/单位填报模版.docx', {
if (val == 1) {
response = await axios.get('/doc/单位填报模版.docx', {
responseType: 'blob' // This is important
});
// Create a link element, set the href to the blob URL, and trigger a click event
@ -158,7 +201,7 @@ export default {
link.remove();
window.URL.revokeObjectURL(url);
}
if (val == 2){
if (val == 2) {
response = await axios.get('/doc/个人填报模版.docx', {
responseType: 'blob' // This is important
});
@ -178,25 +221,25 @@ export default {
console.error('Error downloading the file', error);
}
},
formCom(){
if (this.memberList.length>0){
formCom() {
if (this.memberList.length > 0) {
const id = this.memberList[0].id
this.$router.push('/member?id='+id)
this.$router.push('/member?id=' + id)
}else{
} else {
this.$router.push('/member')
}
},
formPer(){
if (this.personalmemberList.length>0){
formPer() {
if (this.personalmemberList.length > 0) {
const id = this.personalmemberList[0].id
this.$router.push('/personalmember?id='+id)
this.$router.push('/personalmember?id=' + id)
}else{
} else {
this.$router.push('/personalmember')
}
},
goIntro(){
goIntro() {
this.$router.push('/introContents')
}
}
@ -204,22 +247,22 @@ export default {
</script>
<style lang="scss" scoped>
.m-box-F{
.m-box-F {
background-color: #F4EACF;
padding: 15px;
width: 100%;
height: 100vh;
.m-banner-box{
.m-banner-box {
width: 100%;
height: fit-content;
.img{
.img {
width: 100%;
}
}
.m-intro-box{
.m-intro-box {
width: 100%;
height: 60px;
display: flex;
@ -230,20 +273,20 @@ export default {
background-repeat: no-repeat;
margin-top: 25px;
.img{
.img {
width: 18px;
height: auto;
margin-right: 20px;
}
.m-left-intro{
.m-left-intro {
display: flex;
align-items: center;
color: #F4EACF;
font-size: 16px;
font-weight: 500;
.img{
.img {
width: 30px;
height: auto;
margin-right: 10px;
@ -252,7 +295,7 @@ export default {
}
}
.m-title{
.m-title {
margin-top: 20px;
margin-bottom: 20px;
font-family: Source Han Sans SC;
@ -262,13 +305,13 @@ export default {
line-height: 20px;
}
.btn-box{
.btn-box {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.btn{
.btn {
width: 45%;
height: 86px;
display: flex;
@ -278,7 +321,7 @@ export default {
background-size: cover;
background-repeat: no-repeat;
.img{
.img {
width: 34px;
height: auto;
margin-right: 15px;
@ -290,24 +333,118 @@ export default {
background-size: cover;
}
.btn-text{
.btn-text {
color: #F4EACF;
}
}
}
.btn.green{
.btn.green {
background-image: url("../../assets/images/green.png");
}
.btn.red{
.btn.red {
background-image: url("../../assets/images/red.png");
}
.btn.blue{
.btn.blue {
background-image: url("../../assets/images/blue.png");
}
.btn.grown{
.btn.grown {
background-image: url("../../assets/images/brown.png");
}
}
.m-box-P{
padding: 15px;
width: 100%;
height: 100vh;
background-image: url("../../assets/images/banner2@2x.png");
background-repeat: no-repeat;
background-size: cover;
.pc-box-F{
max-width: 1200px;
margin: 0 auto;
.title{
font-family: Songti SC;
font-weight: 900;
font-size: 24px;
color: #723233;
text-align: center;
margin: 50px 0;
}
.m-content{
display: flex;
margin-top: 110px;
.content-left{
width: 390px;
height: 500px;
margin-right: 70px;
.img{
width: 100%;
height: auto;
transition: all ease-in-out 0.5s;
cursor: pointer;
opacity: 0.8;
}
.img:hover{
scale: 1.1;
opacity: 1;
}
}
.content-right{
width: 700px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
.content-right-top{
display: flex;
flex-direction: column;
width: 100%;
.content-title{
margin: -50px 0 20px;
}
.content-btns{
display: flex;
width: 100%;
align-items: center;
justify-content: space-between;
.img{
width: 320px;
height: auto;
transition: all ease-in-out 0.5s;
cursor: pointer;
opacity: 0.8;
}
.img:hover{
scale: 1.1;
opacity: 1;
}
}
}
}
}
.m-feet{
font-family: Source Han Sans SC;
font-weight: 500;
font-size: 20px;
color: #723233;
line-height: 40px;
text-align: center;
margin: 100px 0 0;
}
}
}
::v-deep .m-dialog {
.el-dialog {
margin-top: 36vh !important;
@ -321,12 +458,13 @@ export default {
// left: 50%;
// transform: translateX(-25%);
//
.el-dialog__close{
//font-size: 22px;
//background: #fff;
//border-radius: 50%;
color: #723233;
}
.el-dialog__close {
//font-size: 22px;
//background: #fff;
//border-radius: 50%;
color: #723233;
}
//}
.el-dialog__body {

@ -792,7 +792,7 @@ export default {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认下载个人会员编号为"' + ids + '"的文件?').then(function () {
unitBatchExport(ids).then(res=>{
window.open(this_.baseUrl + "/profile/upload" + res, '_blank')
window.open(this_.baseUrl + "/profile/upload" + res.msg, '_blank')
})
})
// .then(() => {

@ -858,7 +858,7 @@ export default {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认下载个人会员编号为"' + ids + '"的文件?').then(function () {
personalExport(ids).then(res=>{
window.open(this_.baseUrl + "/profile/upload" + res, '_blank')
window.open(this_.baseUrl + "/profile/upload" + res.msg, '_blank')
})
})
// .then(() => {

Loading…
Cancel
Save