Skip to content

C
company_app
提交 b44f8b74 作者: 毛细亚
操作

更新代码

上级 cf4eb8fc
正在显示 包含 96 行增加 和 36 行删除
src/api/works.js
......@@ -79,4 +79,14 @@ export function toTransfer(data) {
method: 'post',
data
})
}
\ No newline at end of file
}
// 解绑掌游账号
export function zyouUnBind(data) {
return request({
url: returnApi('/external_user/zyouUnBind'),
method: 'post',
data
})
}
\ No newline at end of file
src/components/textEditor.vue
......@@ -34,6 +34,7 @@
title="查看大图"
append-to-body
center
top="50%"
:visible.sync="showScoleImage"
>
<div class="showScoleImageContent columnFlex allCenter" v-html="remark"></div>
......
src/styles/index.scss
......@@ -592,9 +592,11 @@ li {
.el-message-box{
max-width: 300px;
z-index: 10000 !important;
}
.el-message{
max-width: 300px;
z-index: 10000 !important;
}
......
src/views/components/bindGameAccount/addUser.vue
......@@ -95,7 +95,7 @@
</el-form-item>
</div>
</el-form>
<div class="table">
<div class="table account_table">
<div class="bind-account-title">
账号列表
</div>
......@@ -172,7 +172,7 @@
<el-button
class="btn"
size="small"
@click="$emit('update:show', false)"
@click="close"
>取 消</el-button>
</span>
</el-drawer>
......@@ -230,7 +230,7 @@
}
},
mounted() {
},
methods: {
...mapActions('game', ['gameBindUser']),
......@@ -306,6 +306,7 @@
close() {
this.$emit('update:show', false)
this.resizeData()
this.$emit('close')
},
onSubmit() {
this.$refs.form.validate((valid) => {
......@@ -462,6 +463,7 @@
height: auto;
padding-left: 20px;
margin-top: -20px;
margin-bottom: 150px;
.item {
width: 100%;
margin-top: 20px;
......@@ -483,6 +485,12 @@
}
}
}
}
.account_table{
width: 100%;
height: auto;
overflow: auto;
}
.account_type {
color: #f56c6c;
......
src/views/components/bindGameAccount/bindUserList.vue
......@@ -18,6 +18,7 @@
:show.sync="showLayer"
title="选择玩家"
width="60%"
@close="close"
/>
</div>
</template>
......@@ -83,6 +84,9 @@ export default {
this.set_accountSelect(value)
}
},
close(){
this.bindAccount = this.accountSelect
},
gameMemberView(item) {
if (this.accountSelect && this.accountSelect !== '') {
const data = { member_id: this.accountSelect, need_channel: 1, need_roleInfo: 1, need_banned: 1 }
......
src/views/login.vue
......@@ -302,6 +302,7 @@ export default {
const corp_id = Cookies.get('corp_id')
if(ddParams.code=='error' && ddParams.msg){
this.$message.error(ddParams.msg)
window.location.href = window.location.origin +'/company_app/index.html?corp_id='+corp_id+'&msg=error'
return
}
if(ddParams.token && ddParams.token!='undefined'){
......
src/views/userInfo/components/Info.vue
......@@ -56,8 +56,8 @@
>
<el-button-group>
<el-button size="mini" @click="zyouUnBindConfirm">解绑</el-button>
<el-button size="mini" @click="autoResetPassword">修改密码</el-button>
<el-button size="mini" @click="changePhoneClick">修改手机号</el-button>
<!-- <el-button size="mini" @click="autoResetPassword">修改密码</el-button>
<el-button size="mini" @click="changePhoneClick">修改手机号</el-button> -->
<el-button v-if="!chatUserDetails.bind_cser" size="mini" @click="relationKfh">关联客服</el-button>
<el-button size="mini" v-if="false" @click="errorHandle">误操作</el-button>
</el-button-group>
......@@ -176,13 +176,13 @@
</div>
</template>
<script>
import { mapState } from 'vuex'
import { mapState,mapMutations } from 'vuex'
import gameDetails from './gameInfo/gameUserInfo.vue'
import shareInfo from './shareInfo.vue'
import changePhone from './changePhone.vue'
import watchMember from '@/mixins/watchMember'
import { zyouUnBind,autoResetPassword,bindUserSelfAdd } from '@/api/game'
import { memberBindCser,editUser } from '@/api/works'
import { autoResetPassword,bindUserSelfAdd } from '@/api/game'
import { memberBindCser,editUser,zyouUnBind } from '@/api/works'
export default {
name: 'UserDetailsPanel',
components: {
......@@ -222,6 +222,7 @@ import watchMember from '@/mixins/watchMember'
mounted() {
},
methods: {
...mapMutations('game', ['set_accountSelect']),
memberChange() {
this.requestBindUser()
},
......@@ -257,18 +258,19 @@ import watchMember from '@/mixins/watchMember'
},
zyouUnBind() {
const data = {
userid: this.selectUser.userid,
userid: this.chatUserDetails.userid,
external_userid: this.chatUserDetails.external_userid,
member_id: this.accountSelect
}
zyouUnBind(data).then((res) => {
if (res.status_code == 1) {
this.$message.success(res.msg)
this.set_selectWindow()
const index = this.bindGameUserList.findIndex(item => item.member_id == this.accountSelect)
this.bindGameUserList.splice(index,1)
this.set_accountSelect(this.bindGameUserList[0].member_id)
}
})
},
// 修改密码 之前是客服手动设置密码 现在改成系统自动设置密码
autoResetPassword() {
this.$confirm('确认重置密码吗？密码重置后玩家将无法登录，请谨慎操作！', '重置密码', {
......
src/views/userInfo/components/ViolationRecord.vue
......@@ -123,9 +123,9 @@
<el-dialog
title="查看大图"
:visible.sync="imageLayer"
width="50%"
width="320px"
center
append-to-body
fit="contain"
@close="imageLayer = false"
>
<div
......@@ -238,7 +238,7 @@ export default {
.layerImage {
img {
max-width: 800px;
max-width: 300px;
}
}
</style>
......
src/views/userInfo/components/roleInfo/approval.vue
<template>
<div class="approval-role-list columnFlex">
<el-form ref="taskForm" :model="reportForm" label-position="top" class="taskForm" label-width="85px">
<el-form ref="taskForm" :model="reportForm" :inline="true" class="taskForm" label-width="85px">
<el-form-item label="角色名称">
<el-input
v-model="reportForm.role_name"
style="width:95%;"
clearable
placeholder="请输入角色名称"
@change="filterChange"
......@@ -14,7 +13,6 @@
<el-form-item label="审批状态">
<el-select
v-model="reportForm.approval_status"
style="width:95%;"
clearable
placeholder="请选择审批状态"
@change="filterChange"
......@@ -26,7 +24,6 @@
<el-form-item label="申请方式">
<el-select
v-model="reportForm.register_type"
style="width:95%;"
clearable
placeholder="请选择申请方式"
@change="filterChange"
......@@ -40,7 +37,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="时间范围">
<!-- <el-form-item label="时间范围">
<BiDatePicker
v-model="reportForm.create_time"
style="width: 95%"
......@@ -55,7 +52,31 @@
end-placeholder="结束日期"
@change="createResult"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="开始时间">
<el-date-picker
v-model="reportForm.create_time_start"
type="datetime"
style="width: 100%;"
value-format="yyyy-MM-dd HH:mm:ss"
@change="createResult"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker
v-model="reportForm.create_time_end"
type="datetime"
style="width: 100%;"
@change="endResult"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="filterChange">搜索</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
<div
v-infinite-scroll="paperScroll"
......@@ -199,7 +220,7 @@
</div>
</div>
</div>
<el-dialog :visible.sync="dialogRemarkVisible" append-to-body title="查看大图" custom-class="remake-dialog">
<el-dialog :visible.sync="dialogRemarkVisible" top="50%" center append-to-body title="查看大图" custom-class="remake-dialog">
<div class="remake-box">
<div v-html="dialogRemake"></div>
</div>
......@@ -260,7 +281,6 @@ import { debounce } from '@/utils'
role_name: '',
register_type: 1,
approval_status: '',
create_time: [],
create_time_start: '',
create_time_end: ''
},
......@@ -280,9 +300,7 @@ import { debounce } from '@/utils'
taskTypeList: []
}
},
// 9111321331231903744
mounted() {
this.reportForm.create_time = [this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss'), this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')]
this.reportForm.create_time_start = this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss')
this.reportForm.create_time_end = this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
this.requstApprovalList()
......@@ -290,24 +308,37 @@ import { debounce } from '@/utils'
this.filterChange()
},
methods: {
resetForm(){
this.reportForm={
customer_id: '',
member_id: '',
role_id: '',
username: '',
role_name: '',
register_type: 1,
approval_status: '',
create_time_start: this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss') ,
create_time_end: this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
}
},
memberChange() {
this.filterChange()
},
filterChange() {
if (this.$moment(this.reportForm.create_time_start).isAfter(this.$moment(this.reportForm.create_time_end))) {
this.$message.warning('开始时间不能大于结束时间')
return
}
this.pageInfo.page = 1
this.reportList = []
this.isMoreRecord = true
this.appealList()
},
createResult(data) {
if (data) {
this.reportForm.create_time_start = data[0]
this.reportForm.create_time_end = data[1]
} else {
this.reportForm.create_time_start = ''
this.reportForm.create_time_end = ''
}
this.filterChange()
this.reportForm.create_time_start = data
},
endResult(data){
this.reportForm.create_time_end = data
},
async requstApprovalList() {
const data = {
......@@ -888,4 +919,5 @@ import { debounce } from '@/utils'
margin-bottom: 20px;
margin-top: 20px;
}
</style>
\ No newline at end of file
</style>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论