huoran
/
FE_preschoolEdu_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix

Browse Source
master
yujialong 11 months ago
parent ccf21096c2
commit 47ee20af77
9 changed files with 623 additions and 465 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/api/index.js
  2. 2
      src/pages/miniProgramMg/index/banner/add/index.vue
  3. 4
      src/pages/miniProgramMg/index/banner/list/index.vue
  4. 4
      src/pages/miniProgramMg/index/hot/add/index.vue
  5. 4
      src/pages/miniProgramMg/index/hot/list/index.vue
  6. 84
      src/pages/miniProgramMg/index/inlet/index.vue
  7. 28
      src/pages/setting/list/index.vue
  8. 175
      src/pages/setting/list/info.vue
  9. 4
      src/pages/user/detail/index.vue

3
src/api/index.js
Unescape View File

@ -8,6 +8,9 @@ export default {
verification: `${host}users/users/user/captcha`, verification: `${host}users/users/user/captcha`,
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`, sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,
queryUserInfoDetails: `users/users/userAccount/queryUserInfoDetails`,
updatePersonCenter: `users/users/userAccount/updatePersonCenter`,
updateUserAvatars: `${host}users/users/userAccount/updateUserAvatars`,
queryProvince: `nakadai/nakadai/province/queryProvince`, queryProvince: `nakadai/nakadai/province/queryProvince`,
queryCity: `nakadai/nakadai/city/queryCity`, queryCity: `nakadai/nakadai/city/queryCity`,

2
src/pages/miniProgramMg/index/banner/add/index.vue
Unescape View File

@ -79,7 +79,7 @@
<el-button @click="save(0)">保存</el-button> <el-button @click="save(0)">保存</el-button>
<el-button type="primary" <el-button type="primary"
@click="save(1)">发布</el-button> @click="save(1)">发布</el-button>
<el-button @click="$router.back()">取消</el-button> <el-button @click="$emit('closeDia')">取消</el-button>
</div> </div>
</div> </div>
</template> </template>

4
src/pages/miniProgramMg/index/banner/list/index.vue
Unescape View File

@ -83,11 +83,11 @@ export default {
this.$store.commit('user/setCrumbs', [ this.$store.commit('user/setCrumbs', [
{ {
name: '小程序管理', name: '小程序管理',
path: '/miniProgramMg/index' route: '/miniProgramMg'
}, },
{ {
name: '首页设置', name: '首页设置',
path: '/miniProgramMg/banner' route: '/miniProgramMg'
}, },
{ {
name: '设置banner', name: '设置banner',

4
src/pages/miniProgramMg/index/hot/add/index.vue
Unescape View File

@ -93,7 +93,7 @@
<el-button @click="save(0)">保存</el-button> <el-button @click="save(0)">保存</el-button>
<el-button type="primary" <el-button type="primary"
@click="save(1)">发布</el-button> @click="save(1)">发布</el-button>
<el-button @click="$router.back()">取消</el-button> <el-button @click="$emit('closeDia')">取消</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -237,7 +237,7 @@ export default {
beforeRemove (file, fileList) { beforeRemove (file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`); return this.$confirm(`确定移除 ${file.name}？`);
}, },
handleRemove () { handleRemove (file, fileList) {
Oss.del(file.url) Oss.del(file.url)
this.pics = fileList this.pics = fileList
}, },

4
src/pages/miniProgramMg/index/hot/list/index.vue
Unescape View File

@ -105,11 +105,11 @@ export default {
this.$store.commit('user/setCrumbs', [ this.$store.commit('user/setCrumbs', [
{ {
name: '小程序管理', name: '小程序管理',
path: '/miniProgramMg/index' route: '/miniProgramMg'
}, },
{ {
name: '首页设置', name: '首页设置',
path: '/miniProgramMg/hot' route: '/miniProgramMg'
}, },
{ {
name: '设置爆款', name: '设置爆款',

84
src/pages/miniProgramMg/index/inlet/index.vue
Unescape View File

@ -15,15 +15,67 @@
<div class="cover" <div class="cover"
@click="toSet(0)">设置爆款</div> @click="toSet(0)">设置爆款</div>
</div> </div>
<div class="activity">
<h6>活动速递</h6>
<el-tabs v-model="active">
<el-tab-pane v-for="(item, i) in tabs"
:key="i"
:label="item.name"
:name="item.id"></el-tab-pane>
</el-tabs>
<ul class="list">
<li>
<img class="pic"
src="http://124.71.79.122/images/miniProgram/supplier-banner.jpg"
alt="">
<div class="texts">
<p class="name">中国幼教年会西部峰会</p>
<p class="meta">报名时间：2024-01-11 23:00</p>
<p class="meta">主办方：中国幼教</p>
</div>
</li>
</ul>
</div>
</div> </div>
</template> </template>
<script> <script>
import Setting from "@/setting";
export default { export default {
data () { data () {
return { return {
tabs: [
{
id: '',
name: '全部'
},
{
id: 1,
name: '会议'
},
{
id: 2,
name: '论坛'
},
{
id: 3,
name: '讲座'
},
{
id: 4,
name: '展会'
},
// {
// id: 5,
// name: '培训'
// },
// {
// id: 6,
// name: '大赛'
// },
],
active: '',
}; };
}, },
mounted () { mounted () {
@ -49,6 +101,34 @@ export default {
@import '../../../../styles/page/page.scss'; @import '../../../../styles/page/page.scss';
.page { .page {
width: 400px; width: 400px;
height: 560px;
min-height: 580px !important;
margin: 0 auto; margin: 0 auto;
} }
.activity {
margin-top: 20px;
h6 {
font-size: 20px;
}
.list {
li {
display: flex;
}
.pic {
width: 140px;
height: 90px;
margin-right: 10px;
border-radius: 8px;
}
.name {
font-size: 16px;
font-weight: 600;
}
.meta {
margin: 5px 0;
font-size: 12px;
color: #999;
}
}
}
</style> </style>

28
src/pages/setting/list/index.vue
Unescape View File

@ -3,20 +3,32 @@
<div class="left"> <div class="left">
<div class="inner"> <div class="inner">
<div class="text-center"> <div class="text-center">
<img :src="avatar" class="avatar" /> <img :src="avatar"
<el-upload :action="this.api.updateUserAvatars" name="file" :data="{ userId }" :limit="10" :show-file-list="false" :headers="headers" :on-success="changeAvatar"> class="avatar" />
<el-button type="text" size="small">点击更换头像</el-button> <el-upload :action="this.api.updateUserAvatars"
name="file"
:limit="10"
:show-file-list="false"
:headers="headers"
:on-success="changeAvatar">
<el-button type="text"
size="small">点击更换头像</el-button>
</el-upload> </el-upload>
</div> </div>
<ul class="menu"> <ul class="menu">
<li v-for="item in typeList" :key="item.index" :class="{active: item.index == active}"> <li v-for="item in typeList"
:key="item.index"
:class="{active: item.index == active}">
{{ item.title }} {{ item.title }}
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<info class="flex-1" ref="info" @updateStatus="updateStatus" @back="back"></info> <info class="flex-1"
ref="info"
@updateStatus="updateStatus"
@back="back"></info>
</div> </div>
</template> </template>
@ -44,7 +56,7 @@ export default {
components: { info }, components: { info },
computed: { computed: {
...mapState('user', [ ...mapState('user', [
'avatar', 'userId' 'avatar'
]), ]),
}, },
// 离开的时候判断是否有保存更改的信息,没有则拦截并提示 // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
@ -70,7 +82,7 @@ export default {
'setAvatar' 'setAvatar'
]), ]),
changeAvatar (res) { changeAvatar (res) {
this.setAvatar(res.data) this.setAvatar(res.message)
}, },
updateStatus (status) { updateStatus (status) {
this.edited = status this.edited = status
@ -102,7 +114,7 @@ export default {
.left { .left {
margin-right: 12px; margin-right: 12px;
background-color: #fff; background-color: #fff;
box-shadow: 2px 0px 6px 0px #EEEEEE; box-shadow: 2px 0px 6px 0px #eeeeee;
.inner { .inner {
width: 170px; width: 170px;
padding: 20px 0; padding: 20px 0;

175
src/pages/setting/list/info.vue
Unescape View File

@ -1,127 +1,195 @@
<template> <template>
<div class="relative" v-loading="loading"> <div class="relative"
v-loading="loading">
<div class="page"> <div class="page">
<h6 class="l-title"><img src="@/assets/images/info1.png" alt=""> 基本信息</h6> <h6 class="l-title"><img src="@/assets/images/info1.png"
alt=""> 基本信息</h6>
<div class="page-content"> <div class="page-content">
<ul class="list"> <ul class="list">
<li> <li>
<label>姓名：</label> <label>姓名：</label>
<el-input placeholder="请输入姓名" type="text" v-model="form.realName" /> <el-input placeholder="请输入姓名"
type="text"
v-model="form.hrUserInfo.userName" />
</li> </li>
<li> <li>
<label>性别：</label> <label>性别：</label>
<el-select size="small" v-model="form.sex"> <el-select size="small"
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option> v-model="form.hrUserInfo.sex">
<el-option v-for="item in sexList"
:key="item.value"
:label="item.name"
:value="item.value"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>账号：</label> <label>账号：</label>
<el-input class="m-r-10" type="text" size="small" v-model="form.username"></el-input> <el-input class="m-r-10"
type="text"
size="small"
v-model="form.userAccount.account"></el-input>
<!-- <el-button type="text" size="small" @click="showAccount">修改</el-button> --> <!-- <el-button type="text" size="small" @click="showAccount">修改</el-button> -->
</li> </li>
<li> <li>
<label>工号：</label> <label>工号：</label>
<el-input size="small" v-model="form.jobNumber" clearable></el-input> <el-input size="small"
v-model="form.userAccount.workNumber"
clearable></el-input>
</li> </li>
<li> <li>
<label>邮箱：</label> <label>邮箱：</label>
<el-input class="m-r-10" size="small" v-model="form.email"></el-input> <el-input class="m-r-10"
size="small"
v-model="form.hrUserInfo.email"></el-input>
<!-- <el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button> <!-- <el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="text" size="small" @click="bindEmail">添加</el-button> --> <el-button v-else type="text" size="small" @click="bindEmail">添加</el-button> -->
</li> </li>
<li> <li>
<label>手机号：</label> <label>手机号：</label>
<el-input class="m-r-10" type="text" size="small" maxlength="11" v-model="form.phone"></el-input> <el-input class="m-r-10"
type="text"
size="small"
maxlength="11"
v-model="form.hrUserInfo.phone"></el-input>
<!-- <el-button type="text" size="small" @click="bindPhone">{{ form.phone ? '更换' : '绑定' }}</el-button> <!-- <el-button type="text" size="small" @click="bindPhone">{{ form.phone ? '更换' : '绑定' }}</el-button>
<el-button v-if="form.phone" type="text" size="small" @click="unbind">解绑</el-button> --> <el-button v-if="form.phone" type="text" size="small" @click="unbind">解绑</el-button> -->
</li> </li>
<li> <li>
<label>密码：</label> <label>密码：</label>
<el-input class="m-r-10" size="small" value="******" disabled></el-input> <el-input class="m-r-10"
<el-button type="text" size="small" @click="bindPassword">修改</el-button> size="small"
value="******"
disabled></el-input>
<el-button type="text"
size="small"
@click="bindPassword">修改</el-button>
</li> </li>
</ul> </ul>
</div> </div>
<div class="btn-wrap"> <div class="btn-wrap">
<el-button size="small" v-throttle @click="$emit('back')">取消</el-button> <el-button size="small"
<el-button type="primary" size="small" v-throttle @click="submit">更新</el-button> v-throttle
@click="$emit('back')">取消</el-button>
<el-button type="primary"
size="small"
v-throttle
@click="submit">更新</el-button>
</div> </div>
</div> </div>
<el-dialog <el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'"
:title="form.email ? '更换邮箱' : '绑定邮箱'"
:visible.sync="emailVisible" :visible.sync="emailVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closeEmail" @close="closeEmail"
width="30%"> width="30%">
<el-form ref="form" :model="form" label-width="60px"> <el-form ref="form"
:model="form"
label-width="60px">
<el-form-item label="邮箱"> <el-form-item label="邮箱">
<el-input placeholder="请输入邮箱" v-model="email"></el-input> <el-input placeholder="请输入邮箱"
v-model="email"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="flex-between"> <div class="flex-between">
<el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="emailCode"
<el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{ emailBtnText }}</el-button> placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendEmailCode"
:disabled="emailDisabled">{{ emailBtnText }}</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="emailVisible = false">取 消</el-button> <el-button @click="emailVisible = false">取 消</el-button>
<el-button type="primary" @click="emailSubmit">确 定</el-button> <el-button type="primary"
@click="emailSubmit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'"
:title="form.phone ? '更换手机号' : '绑定手机号'"
:visible.sync="phoneVisible" :visible.sync="phoneVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePhone" @close="closePhone"
width="30%"> width="30%">
<el-form ref="form" :model="form" label-width="60px"> <el-form ref="form"
:model="form"
label-width="60px">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input style="width: 404px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input> <el-input style="width: 404px;"
placeholder="请输入手机号"
v-model="phone"
maxlength="11"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="flex-between"> <div class="flex-between">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="phoneCode"
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText }}</el-button> placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendPhoneCode"
:disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="phoneVisible = false">取 消</el-button> <el-button @click="phoneVisible = false">取 消</el-button>
<el-button type="primary" @click="phoneSubmit">确 定</el-button> <el-button type="primary"
@click="phoneSubmit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="更换密码"
title="更换密码"
:visible.sync="pwdVisible" :visible.sync="pwdVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePassword" @close="closePassword"
width="30%"> width="30%">
<el-form ref="pwdForm" :model="form" label-width="60px"> <el-form ref="pwdForm"
:model="form"
label-width="60px">
<el-form-item label="原密码"> <el-form-item label="原密码">
<el-input type="password" v-model="pwdForm.password" placeholder="请输入原密码"></el-input> <el-input type="password"
v-model="pwdForm.password"
placeholder="请输入原密码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码"> <el-form-item label="新密码">
<el-input type="password" v-model="pwdForm.newPassword" placeholder="请输入新密码" @keyup.enter.native="editPassword"></el-input> <el-input type="password"
v-model="pwdForm.newPassword"
placeholder="请输入新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码"> <el-form-item label="新密码">
<el-input type="password" v-model="pwdForm.reNewPassword" placeholder="请确认新密码" @keyup.enter.native="editPassword"></el-input> <el-input type="password"
v-model="pwdForm.reNewPassword"
placeholder="请确认新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="pwdVisible = false">取 消</el-button> <el-button @click="pwdVisible = false">取 消</el-button>
<el-button type="primary" @click="editPassword">确 定</el-button> <el-button type="primary"
@click="editPassword">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="修改账号" :visible.sync="accountVisible" :close-on-click-modal="false" width="30%"> <el-dialog title="修改账号"
:visible.sync="accountVisible"
:close-on-click-modal="false"
width="30%">
<el-form label-width="70px"> <el-form label-width="70px">
<el-form-item label="账号"> <el-form-item label="账号">
<el-input v-model="editUsername" placeholder="请输入账号"></el-input> <el-input v-model="editUsername"
placeholder="请输入账号"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
<el-button size="small" @click="accountVisible = false">取 消</el-button> class="dialog-footer">
<el-button size="small" type="primary" @click="confirmAccount">确 定</el-button> <el-button size="small"
@click="accountVisible = false">取 消</el-button>
<el-button size="small"
type="primary"
@click="confirmAccount">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -140,6 +208,8 @@ export default {
updateTime: 0, updateTime: 0,
token: util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
form: { form: {
hrUserInfo: {},
userAccount: {},
userName: "", userName: "",
name: "", name: "",
jobNumber: "", jobNumber: "",
@ -208,8 +278,8 @@ export default {
// 获取用户信息 // 获取用户信息
getData () { getData () {
this.loading = true this.loading = true
this.$get(`${this.api.user}/${this.userId}`).then(({ data }) => { this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
this.form = data this.form = result
this.loading = false this.loading = false
}).catch(err => { }) }).catch(err => { })
}, },
@ -279,17 +349,9 @@ export default {
}, },
submit () { submit () {
const { form } = this const { form } = this
this.$put(this.api.user, { this.$post(this.api.updatePersonCenter, this.form).then(res => {
id: form.id,
jobNumber: form.jobNumber,
phone: form.phone,
realName: form.realName,
username: form.username,
email: form.email,
sex: form.sex,
}).then(res => {
this.$emit('updateStatus', false) this.$emit('updateStatus', false)
this.setUserName(form.realName) this.setUserName(form.hrUserInfo.userName)
this.$message.success("提交成功！") this.$message.success("提交成功！")
}).catch(res => { }) }).catch(res => { })
}, },
@ -429,10 +491,11 @@ export default {
display: flex; display: flex;
margin-bottom: 24px; margin-bottom: 24px;
} }
.el-input, .el-select { .el-input,
.el-select {
width: 220px; width: 220px;
.el-input__inner { .el-input__inner {
border-color: #CACFDB; border-color: #cacfdb;
} }
} }
li { li {

4
src/pages/user/detail/index.vue
Unescape View File

@ -20,7 +20,7 @@
maxlength="11"></el-input> maxlength="11"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="用户名称"> <el-form-item label="组织名称">
<el-input v-model="item.account" <el-input v-model="item.account"
placeholder="请输入用户名称"></el-input> placeholder="请输入用户名称"></el-input>
</el-form-item> </el-form-item>
@ -71,7 +71,7 @@
</div> </div>
<div class="page"> <div class="page">
<p class="l-title">已绑定的平台和用户信息</p> <p class="l-title">已绑定的组织信息</p>
<el-table :data="platformList" <el-table :data="platformList"
class="table" class="table"
stripe stripe

Write Preview
Loading…
Cancel
Save