yujialong 11 months ago
parent 7473b607db
commit 53ca424a1f
  1. BIN
      src/assets/images/logo.png
  2. BIN
      src/assets/images/logo1.png
  3. 56
      src/components/editor.js
  4. 2
      src/layouts/navbar/index.vue
  5. 7
      src/pages/account/login/index.vue
  6. 1
      src/pages/activity/add/index.vue
  7. 2
      src/pages/activity/list/index.vue
  8. 12
      src/pages/preschool/list/index.vue
  9. 13
      src/pages/supplier/list/index.vue
  10. 2
      src/pages/user/detail/index.vue
  11. 6
      src/pages/user/list/index.vue

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 386 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 331 KiB

@ -1,7 +1,5 @@
import Axios from 'axios' import Oss from '@/components/upload/upload.js'
import Api from '@/api' import { Loading } from 'element-ui'
import Setting from '@/setting'
import Util from '@/libs/util'
export default { export default {
//skin:'oxide-dark', //skin:'oxide-dark',
language:'zh_CN', language:'zh_CN',
@ -312,21 +310,25 @@ export default {
powerpaste_allow_local_images: true, powerpaste_allow_local_images: true,
powerpaste_word_import: 'clean', powerpaste_word_import: 'clean',
powerpaste_html_import: 'clean', powerpaste_html_import: 'clean',
urlconverter_callback: (url, node, onSave, name) => {
if (node === 'img' && url.startsWith('blob:')) {
// Do some custom URL conversion
tinymce.activeEditor && tinymce.activeEditor.uploadImages()
}
// Return new URL
return url
},
// 自定义上传 // 自定义上传
images_upload_handler: function (blobInfo, succFun, failFun) { images_upload_handler: function (blobInfo, succFun, failFun) {
const form = new FormData() const blob = blobInfo.blob()
form.append('file', blobInfo.blob()), // blob转换为file
Axios({ const file = new File([blob], blobInfo.filename(), {
method: 'post', type: 'application/json',
url: Api.upload, lastModified: Date.now()
data: form, });
headers: { Oss.upload(file).then(res => {
'Content-Type': 'multipart/form-data', succFun(res.url)
token: Util.local.get(Setting.tokenKey) })
},
}).then(({ data }) => {
succFun(data.url)
}).catch(res => {})
}, },
//自定义文件选择器的回调内容 此方法只有在点击上方图片按钮才会触发 //自定义文件选择器的回调内容 此方法只有在点击上方图片按钮才会触发
file_picker_callback: function (callback, value, meta) { file_picker_callback: function (callback, value, meta) {
@ -344,19 +346,13 @@ export default {
input.setAttribute("accept", ".mp4"); input.setAttribute("accept", ".mp4");
input.onchange = function(){ input.onchange = function(){
let file = this.files[0]; let file = this.files[0];
let fd = new FormData(); const load = Loading.service()
fd.append("file", file); Oss.upload(file).then(res => {
Axios({ load.close()
method: 'post', callback(res.url)
url: Api.upload, }).catch(e => {
data: fd, load.close()
headers: { })
'Content-Type': 'multipart/form-data',
token: Util.local.get(Setting.tokenKey)
},
}).then(({ data }) => {
callback(data.url)
}).catch(res => {})
} }
//触发点击 //触发点击
input.click(); input.click();

@ -5,7 +5,7 @@
<img width="30" <img width="30"
src="@/assets/images/logo.png" src="@/assets/images/logo.png"
alt=""> alt="">
<span>网站管理后台</span> <span>运营管理后台</span>
</div> </div>
<el-menu :default-active="active" <el-menu :default-active="active"

@ -5,7 +5,7 @@
<img width="30" <img width="30"
src="@/assets/images/logo.png" src="@/assets/images/logo.png"
alt=""> alt="">
网站管理后台 运营管理后台
</div> </div>
</div> </div>
<div class="form"> <div class="form">
@ -38,11 +38,6 @@
type="primary" type="primary"
@click="submit">登录</el-button> @click="submit">登录</el-button>
</div> </div>
<div class="home">
<img src="@/assets/images/home.png"
alt="">
回到官网
</div>
</div> </div>
</template> </template>
<script> <script>

@ -431,6 +431,7 @@ export default {
if (!form.playStartTime) return Util.warningMsg("请选择举办时间"); if (!form.playStartTime) return Util.warningMsg("请选择举办时间");
if (playStartTime && signUpEndTime && playStartTime < signUpEndTime) return Util.warningMsg("举办时间不能早于报名结束时间"); if (playStartTime && signUpEndTime && playStartTime < signUpEndTime) return Util.warningMsg("举办时间不能早于报名结束时间");
if (form.isNeedCode && (!form.invitationCode || form.invitationCode.length !== 4)) return Util.warningMsg('请填写四位数邀请码') if (form.isNeedCode && (!form.invitationCode || form.invitationCode.length !== 4)) return Util.warningMsg('请填写四位数邀请码')
if (!form.competitionScope && !this.competitionScope.length) return Util.warningMsg('请选择指定范围')
if (!form.quantityLimit) return Util.warningMsg('请填写报名人数上限') if (!form.quantityLimit) return Util.warningMsg('请填写报名人数上限')
if (!form.description) return Util.warningMsg("请填写活动详情"); if (!form.description) return Util.warningMsg("请填写活动详情");
} }

@ -99,7 +99,7 @@
width="120" width="120"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="competitionScope" <el-table-column prop="competitionScope"
label="活动范围" label="发布范围"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="applicantNum" <el-table-column prop="applicantNum"
label="报名人数" label="报名人数"

@ -95,15 +95,15 @@
<el-tabs v-model="active" <el-tabs v-model="active"
@tab-click="tabChange"> @tab-click="tabChange">
<el-tab-pane :label="'全部(' + total + ')'" <el-tab-pane :label="'全部(' + total + ')'"
:name="0"></el-tab-pane> name="0"></el-tab-pane>
<el-tab-pane :label="'待审核(' + status1 + ')'" <el-tab-pane :label="'待审核(' + status1 + ')'"
:name="1"></el-tab-pane> name="1"></el-tab-pane>
<el-tab-pane :label="'已通过(' + status2 + ')'" <el-tab-pane :label="'已通过(' + status2 + ')'"
:name="2"></el-tab-pane> name="2"></el-tab-pane>
<el-tab-pane :label="'不通过(' + status3 + ')'" <el-tab-pane :label="'不通过(' + status3 + ')'"
:name="3"></el-tab-pane> name="3"></el-tab-pane>
<el-tab-pane :label="'未提交' + status4 + ')'" <el-tab-pane :label="'未提交' + status4 + ')'"
:name="4"></el-tab-pane> name="4"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="btn-wrap"> <div class="btn-wrap">
<el-button @click="delAllSelection">批量删除</el-button> <el-button @click="delAllSelection">批量删除</el-button>
@ -242,7 +242,7 @@ export default {
total: 0, total: 0,
multipleSelection: [], multipleSelection: [],
loading: false, loading: false,
active: 0, active: '0',
status1: 0, status1: 0,
status2: 0, status2: 0,
status3: 0, status3: 0,

@ -95,15 +95,15 @@
<el-tabs v-model="active" <el-tabs v-model="active"
@tab-click="tabChange"> @tab-click="tabChange">
<el-tab-pane :label="'全部(' + total + ')'" <el-tab-pane :label="'全部(' + total + ')'"
:name="0"></el-tab-pane> name="0"></el-tab-pane>
<el-tab-pane :label="'待审核(' + status1 + ')'" <el-tab-pane :label="'待审核(' + status1 + ')'"
:name="1"></el-tab-pane> name="1"></el-tab-pane>
<el-tab-pane :label="'已通过(' + status2 + ')'" <el-tab-pane :label="'已通过(' + status2 + ')'"
:name="2"></el-tab-pane> name="2"></el-tab-pane>
<el-tab-pane :label="'不通过(' + status3 + ')'" <el-tab-pane :label="'不通过(' + status3 + ')'"
:name="3"></el-tab-pane> name="3"></el-tab-pane>
<el-tab-pane :label="'未提交' + status4 + ')'" <el-tab-pane :label="'未提交' + status4 + ')'"
:name="4"></el-tab-pane> name="4"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="btn-wrap"> <div class="btn-wrap">
<el-button @click="delAllSelection">批量删除</el-button> <el-button @click="delAllSelection">批量删除</el-button>
@ -192,7 +192,6 @@ import Setting from '@/setting'
import Util from '@/libs/util' import Util from '@/libs/util'
import Const from '@/const/user' import Const from '@/const/user'
export default { export default {
name: 'user',
data () { data () {
return { return {
searchTimer: null, searchTimer: null,
@ -242,7 +241,7 @@ export default {
total: 0, total: 0,
multipleSelection: [], multipleSelection: [],
loading: false, loading: false,
active: 0, active: '0',
status1: 0, status1: 0,
status2: 0, status2: 0,
status3: 0, status3: 0,

@ -1,6 +1,6 @@
<template> <template>
<div class="page"> <div class="page">
<p class="page-name mb">查看用户信息</p> <p class="page-name mb">用户信息</p>
<div> <div>
<p class="l-title">账号信息</p> <p class="l-title">账号信息</p>
<el-form v-for="(item, i) in userAccountList" <el-form v-for="(item, i) in userAccountList"

@ -292,8 +292,7 @@ export default {
this.$confirm('确定要删除吗?', '提示', { this.$confirm('确定要删除吗?', '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$post(this.api.delUserAccounts, [row.userId]).then(async (res) => { this.$post(this.api.delUserAccounts, [row.appOpenId]).then(async (res) => {
await this.$post(this.api.deletePlatformAuthenticationInformation, [row.appOpenId])
Util.successMsg('删除成功') Util.successMsg('删除成功')
this.getData() this.getData()
}).catch(res => { }) }).catch(res => { })
@ -313,12 +312,11 @@ export default {
}, },
delAllSelection () { delAllSelection () {
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
let delList = this.multipleSelection.map(e => e.userId); let delList = this.multipleSelection.map(e => e.appOpenId);
this.$confirm('确定要删除选中数据吗?', '提示', { this.$confirm('确定要删除选中数据吗?', '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$post(this.api.delUserAccounts, delList).then(async (res) => { this.$post(this.api.delUserAccounts, delList).then(async (res) => {
await this.$post(this.api.deletePlatformAuthenticationInformation, this.multipleSelection.map(e => e.appOpenId))
Util.successMsg('删除成功') Util.successMsg('删除成功')
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
this.getData() this.getData()

Loading…
Cancel
Save