yujialong 11 months ago
parent ccf21096c2
commit 47ee20af77
  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. 62
      src/pages/setting/list/index.vue
  8. 245
      src/pages/setting/list/info.vue
  9. 4
      src/pages/user/detail/index.vue

@ -8,6 +8,9 @@ export default {
verification: `${host}users/users/user/captcha`,
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`,
queryCity: `nakadai/nakadai/city/queryCity`,

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

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

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

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

@ -15,15 +15,67 @@
<div class="cover"
@click="toSet(0)">设置爆款</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>
</template>
<script>
import Setting from "@/setting";
export default {
data () {
return {
tabs: [
{
id: '',
name: '全部'
},
{
id: 1,
name: '会议'
},
{
id: 2,
name: '论坛'
},
{
id: 3,
name: '讲座'
},
{
id: 4,
name: '展会'
},
// {
// id: 5,
// name: ''
// },
// {
// id: 6,
// name: ''
// },
],
active: '',
};
},
mounted () {
@ -49,6 +101,34 @@ export default {
@import '../../../../styles/page/page.scss';
.page {
width: 400px;
height: 560px;
min-height: 580px !important;
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>

@ -3,20 +3,32 @@
<div class="left">
<div class="inner">
<div class="text-center">
<img :src="avatar" class="avatar" />
<el-upload :action="this.api.updateUserAvatars" name="file" :data="{ userId }" :limit="10" :show-file-list="false" :headers="headers" :on-success="changeAvatar">
<el-button type="text" size="small">点击更换头像</el-button>
<img :src="avatar"
class="avatar" />
<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>
</div>
<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 }}
</li>
</ul>
</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>
</template>
@ -26,7 +38,7 @@ import Setting from '@/setting'
import util from '@/libs/util'
import info from './info'
export default {
data() {
data () {
return {
headers: {
token: util.local.get(Setting.tokenKey)
@ -44,12 +56,12 @@ export default {
components: { info },
computed: {
...mapState('user', [
'avatar', 'userId'
'avatar'
]),
},
// ,
beforeRouteLeave(to, from, next) {
if(this.edited){
beforeRouteLeave (to, from, next) {
if (this.edited) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning'
}).then(() => {
@ -58,26 +70,26 @@ export default {
}).catch(() => {
next()
})
}else{
} else {
next()
}
},
mounted() {
mounted () {
},
methods: {
...mapMutations('user', [
'setAvatar'
]),
changeAvatar(res) {
this.setAvatar(res.data)
changeAvatar (res) {
this.setAvatar(res.message)
},
updateStatus(status){
updateStatus (status) {
this.edited = status
},
//
back() {
if(this.edited){
back () {
if (this.edited) {
this.edited = false
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning'
@ -87,7 +99,7 @@ export default {
}).catch(() => {
this.$router.back()
})
}else{
} else {
this.$router.back()
}
}
@ -96,31 +108,31 @@ export default {
</script>
<style lang="scss" scoped>
.main{
.main {
display: flex;
margin: 0 auto;
.left{
.left {
margin-right: 12px;
background-color: #fff;
box-shadow: 2px 0px 6px 0px #EEEEEE;
.inner{
box-shadow: 2px 0px 6px 0px #eeeeee;
.inner {
width: 170px;
padding: 20px 0;
}
.avatar{
.avatar {
width: 80px;
height: 80px;
border-radius: 50%;
}
.menu{
.menu {
margin-top: 32px;
li{
li {
padding: 0 20px;
color: #303133;
font-size: 14px;
line-height: 38px;
cursor: pointer;
&.active{
&.active {
color: #fff;
background-color: $main-color;
}

@ -1,127 +1,195 @@
<template>
<div class="relative" v-loading="loading">
<div class="relative"
v-loading="loading">
<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">
<ul class="list">
<li>
<label>姓名</label>
<el-input placeholder="请输入姓名" type="text" v-model="form.realName" />
<el-input placeholder="请输入姓名"
type="text"
v-model="form.hrUserInfo.userName" />
</li>
<li>
<label>性别</label>
<el-select size="small" v-model="form.sex">
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option>
<el-select size="small"
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>
</li>
<li>
<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> -->
</li>
<li>
<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>
<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-else type="text" size="small" @click="bindEmail">添加</el-button> -->
</li>
<li>
<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 v-if="form.phone" type="text" size="small" @click="unbind">解绑</el-button> -->
</li>
<li>
<label>密码</label>
<el-input class="m-r-10" size="small" value="******" disabled></el-input>
<el-button type="text" size="small" @click="bindPassword">修改</el-button>
<el-input class="m-r-10"
size="small"
value="******"
disabled></el-input>
<el-button type="text"
size="small"
@click="bindPassword">修改</el-button>
</li>
</ul>
</div>
<div class="btn-wrap">
<el-button size="small" v-throttle @click="$emit('back')">取消</el-button>
<el-button type="primary" size="small" v-throttle @click="submit">更新</el-button>
<el-button size="small"
v-throttle
@click="$emit('back')">取消</el-button>
<el-button type="primary"
size="small"
v-throttle
@click="submit">更新</el-button>
</div>
</div>
<el-dialog
:title="form.email ? '更换邮箱' : '绑定邮箱'"
<el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'"
:visible.sync="emailVisible"
:close-on-click-modal="false"
@close="closeEmail"
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-input placeholder="请输入邮箱" v-model="email"></el-input>
<el-input placeholder="请输入邮箱"
v-model="email"></el-input>
</el-form-item>
<el-form-item label="验证码">
<div class="flex-between">
<el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{ emailBtnText }}</el-button>
<el-input v-model="emailCode"
placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendEmailCode"
:disabled="emailDisabled">{{ emailBtnText }}</el-button>
</div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<span slot="footer"
class="dialog-footer">
<el-button @click="emailVisible = false"> </el-button>
<el-button type="primary" @click="emailSubmit"> </el-button>
<el-button type="primary"
@click="emailSubmit"> </el-button>
</span>
</el-dialog>
<el-dialog
:title="form.phone ? '更换手机号' : '绑定手机号'"
<el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'"
:visible.sync="phoneVisible"
:close-on-click-modal="false"
@close="closePhone"
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-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 label="验证码">
<div class="flex-between">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
<el-input v-model="phoneCode"
placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendPhoneCode"
:disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
</div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<span slot="footer"
class="dialog-footer">
<el-button @click="phoneVisible = false"> </el-button>
<el-button type="primary" @click="phoneSubmit"> </el-button>
<el-button type="primary"
@click="phoneSubmit"> </el-button>
</span>
</el-dialog>
<el-dialog
title="更换密码"
<el-dialog title="更换密码"
:visible.sync="pwdVisible"
:close-on-click-modal="false"
@close="closePassword"
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-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 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 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>
<span slot="footer" class="dialog-footer">
<span slot="footer"
class="dialog-footer">
<el-button @click="pwdVisible = false"> </el-button>
<el-button type="primary" @click="editPassword"> </el-button>
<el-button type="primary"
@click="editPassword"> </el-button>
</span>
</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-item label="账号">
<el-input v-model="editUsername" placeholder="请输入账号"></el-input>
<el-input v-model="editUsername"
placeholder="请输入账号"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="accountVisible = false"> </el-button>
<el-button size="small" type="primary" @click="confirmAccount"> </el-button>
<span slot="footer"
class="dialog-footer">
<el-button size="small"
@click="accountVisible = false"> </el-button>
<el-button size="small"
type="primary"
@click="confirmAccount"> </el-button>
</span>
</el-dialog>
</div>
@ -132,7 +200,7 @@ import Setting from '@/setting'
import util from '@/libs/util'
import { mapState, mapMutations } from 'vuex'
export default {
data() {
data () {
return {
loading: false,
editUsername: '',
@ -140,6 +208,8 @@ export default {
updateTime: 0,
token: util.local.get(Setting.tokenKey),
form: {
hrUserInfo: {},
userAccount: {},
userName: "",
name: "",
jobNumber: "",
@ -191,14 +261,14 @@ export default {
watch: {
// ,
form: {
handler(){
handler () {
this.updateTime++
if(this.updateTime > 1) this.$emit('updateStatus', this.updateTime > 1)
if (this.updateTime > 1) this.$emit('updateStatus', this.updateTime > 1)
},
deep:true
deep: true
}
},
mounted() {
mounted () {
this.getData()
},
methods: {
@ -206,19 +276,19 @@ export default {
'setUserName'
]),
//
getData() {
getData () {
this.loading = true
this.$get(`${this.api.user}/${this.userId}`).then(({ data }) => {
this.form = data
this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
this.form = result
this.loading = false
}).catch(err => {})
}).catch(err => { })
},
//
showAccount() {
showAccount () {
this.accountVisible = true
},
//
confirmAccount() {
confirmAccount () {
if (this.editUsername) {
form.username = this.editUsername
this.accountVisible = false
@ -226,34 +296,34 @@ export default {
this.$put(this.api.user, form).then(res => {
this.setUserName(form.username)
this.$message.success("提交成功!")
}).catch(res => {})
}).catch(res => { })
} else {
util.errorMsg('请输入账号')
}
},
bindEmail() {
bindEmail () {
this.email = this.form.email
this.emailVisible = true
},
bindPhone() {
bindPhone () {
this.phone = this.form.phone
this.phoneVisible = true
},
//
unbind() {
unbind () {
this.$confirm('确定要解绑该手机号吗?', '提示', {
type: 'warning'
}).then(() => {
this.$get(this.api.unbindMobilePhone).then(res => {
this.$message.success('解绑成功')
this.getData()
}).catch(res => {})
}).catch(() => {})
}).catch(res => { })
}).catch(() => { })
},
bindPassword() {
bindPassword () {
this.pwdVisible = true
},
editPassword() {
editPassword () {
const data = this.pwdForm
if (!data.password) return util.warningMsg("请输入原密码")
if (!data.newPassword) return util.warningMsg("请输入新密码")
@ -268,32 +338,24 @@ export default {
}).then(res => {
util.successMsg("更换成功")
this.pwdVisible = false
}).catch(err => {})
}).catch(err => { })
},
closePassword() {
closePassword () {
this.pwdForm = {
password: "",
newPassword: "",
reNewPassword: ""
}
},
submit() {
submit () {
const { form } = this
this.$put(this.api.user, {
id: form.id,
jobNumber: form.jobNumber,
phone: form.phone,
realName: form.realName,
username: form.username,
email: form.email,
sex: form.sex,
}).then(res => {
this.$post(this.api.updatePersonCenter, this.form).then(res => {
this.$emit('updateStatus', false)
this.setUserName(form.realName)
this.setUserName(form.hrUserInfo.userName)
this.$message.success("提交成功!")
}).catch(res => {})
}).catch(res => { })
},
emailCountdown() {
emailCountdown () {
let count = 60;
if (!this.emailTimer) {
this.emailDisabled = true;
@ -311,7 +373,7 @@ export default {
}, 1000);
}
},
phoneCountdown() {
phoneCountdown () {
let count = 60;
if (!this.phoneTimer) {
this.phoneDisabled = true;
@ -329,12 +391,12 @@ export default {
}, 1000);
}
},
closeEmail() {
closeEmail () {
if (!this.emailDisabled) {
this.emailCode = "";
}
},
sendEmailCode() {
sendEmailCode () {
if (!this.email) return util.warningMsg("请输入邮箱")
if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
this.$post(this.api.sendPhoneOrEmailCode, {
@ -347,9 +409,9 @@ export default {
} else {
util.errorMsg(res.message);
}
}).catch(res => {})
}).catch(res => { })
},
emailSubmit() {
emailSubmit () {
if (!this.email) return util.warningMsg("请输入邮箱")
if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
if (!this.emailCode) return util.warningMsg("请输入验证码")
@ -363,14 +425,14 @@ export default {
util.successMsg("绑定成功")
this.form.email = this.email
this.emailVisible = false
}).catch(res => {})
}).catch(res => { })
},
closePhone() {
closePhone () {
if (!this.emailDisabled) {
this.emailCode = "";
}
},
sendPhoneCode() {
sendPhoneCode () {
if (!this.phone) return util.warningMsg("请输入手机号");
if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
let data = {
@ -388,7 +450,7 @@ export default {
}).catch(res => {
});
},
phoneSubmit() {
phoneSubmit () {
if (!this.phone) return util.warningMsg("请输入手机号");
if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
if (!this.phoneCode) return util.warningMsg("请输入验证码");
@ -424,22 +486,23 @@ export default {
margin-right: 5px;
}
}
.list{
.list {
.line {
display: flex;
margin-bottom: 24px;
}
.el-input, .el-select {
.el-input,
.el-select {
width: 220px;
.el-input__inner{
border-color: #CACFDB;
.el-input__inner {
border-color: #cacfdb;
}
}
li {
display: flex;
align-items: center;
margin-bottom: 20px;
&>label {
& > label {
width: 100px;
margin-right: 5px;
text-align: right;
@ -465,7 +528,7 @@ export default {
padding: 12px 0;
text-align: center;
background-color: #fff;
.el-button{
.el-button {
width: 80px;
}
}

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

Loading…
Cancel
Save