提交 166643d7 作者: 施汉文

🐞 fix: 修改了弹框滚动,以及一些线上报错问题

上级 963caaf8
...@@ -852,3 +852,8 @@ li { ...@@ -852,3 +852,8 @@ li {
.el-input__icon{ .el-input__icon{
line-height: 1; line-height: 1;
} }
//弹框内容超出显示滚动
.el-message-box__message {
max-height: 500px !important;
overflow-y: auto !important;
}
\ No newline at end of file
<template> <template>
<el-select <el-select v-model="resulte" v-loadmore="loadMoreList" filterable remote :disabled="disabled"
v-model="resulte" :remote-method="remoteMethod" :placeholder="placeholder" :clearable='false' reserve-keyword :loading="loading"
v-loadmore="loadMoreList" @change="selectChange">
filterable <el-option v-for="(item, index) in searchUserOption" :key="index" :value="item?.role_id || item.id"
remote :label="item.role_name" style="height:50px;">
:disabled="disabled" <div class="rowFlex columnCenter selectItem">
:remote-method="remoteMethod" <!-- 没有头像 -->
:placeholder="placeholder" <!-- <el-image v-if="item.avata" fit="fill" :src="item.avatar" class="tableImage "></el-image> -->
:clearable='false' <div class="infoSpan columnFlex rowCenter">
reserve-keyword <p class="hidden">
:loading="loading" {{ item.role_name && item.role_name != '' ? item.game_name + ' - ' + item.server_name + ' -
@change="selectChange" '+item.role_name:'' }}
> </p>
<el-option <p class="rowFlex columnCenter">角色名:<label class="hidden" style="max-width:120px;">
v-for="(item,index) in searchUserOption" {{ item.role_name }}
:key="index" </label>
:value="item.role_id || item.id" </p>
:label="item.role_name"
style="height:50px;"
>
<div class="rowFlex columnCenter selectItem">
<!-- 没有头像 -->
<!-- <el-image v-if="item.avata" fit="fill" :src="item.avatar" class="tableImage "></el-image> -->
<div class="infoSpan columnFlex rowCenter">
<p class="hidden">{{ item.role_name &&item.role_name!=''?item.game_name+' - '+item.server_name+' - '+item.role_name:'' }}</p>
<p class="rowFlex columnCenter">角色名:<label class="hidden" style="max-width:120px;">{{ item.role_name }}</label></p>
</div>
</div> </div>
</el-option> </div>
</el-select> </el-option>
</template> </el-select>
<script> </template>
<script>
import { roleList } from '@/api/game' import { roleList } from '@/api/game'
import { mapState } from 'vuex' import { mapState } from 'vuex'
export default { export default {
...@@ -127,29 +118,34 @@ ...@@ -127,29 +118,34 @@
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.selectItem{ .selectItem {
height: 50px; height: 50px;
} }
.infoSpan{
font-size: 12px; .infoSpan {
font-family: PingFangSC-Regular, PingFang SC; font-size: 12px;
font-weight: 400; font-family: PingFangSC-Regular, PingFang SC;
max-width: 250px; font-weight: 400;
height: 50px; max-width: 250px;
p{ height: 50px;
font-size:12px;max-width:100%;
line-height: 20px; p {
} font-size: 12px;
span{ max-width: 100%;
color:#FFA81D; line-height: 20px;
} }
}
.tableImage{ span {
width:30px;height:30px; color: #FFA81D;
border-radius: 30px; }
margin-right: 10px; }
}
</style> .tableImage {
width: 30px;
\ No newline at end of file height: 30px;
border-radius: 30px;
margin-right: 10px;
}
</style>
\ No newline at end of file
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
<template> <template>
<div class="loginContent"> <div class="loginContent">
<div class="loginContentContainer"> <div class="loginContentContainer">
<p class="loginContentTitle">选择客服:</p> <p class="loginContentTitle">选择客服:</p>
<div class="loginContentInput rowFlex alignCenter"> <div class="loginContentInput rowFlex alignCenter">
<el-select v-model="cser_user_id" filterable placeholder="请选择客服"> <el-select v-model="cser_user_id" filterable placeholder="请选择客服">
<el-option v-for="item in userList" :key="item.zq_user_id" clearable :label="item.name" :value="item.zq_user_id"> <el-option v-for="item in userList" :key="item.zq_user_id" clearable :label="item.name"
</el-option> :value="item.zq_user_id">
</el-select> </el-option>
<el-button type="primary" style="margin-left: 10px;" size="small" @click="loginConfirm">点击登录</el-button> </el-select>
</div> <el-button type="primary" style="margin-left: 10px;" size="small" @click="loginConfirm">点击登录</el-button>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -112,6 +113,10 @@ export default { ...@@ -112,6 +113,10 @@ export default {
}, },
loginConfirm(){ loginConfirm(){
const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id) const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id)
if (!cser_user) {
this.$message.error('请选择客服')
return
}
this.$confirm(`确认登录上线吗,上线后所有会话都会归属到客服【${cser_user.name}】`, '提示', { this.$confirm(`确认登录上线吗,上线后所有会话都会归属到客服【${cser_user.name}】`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -294,12 +299,14 @@ export default { ...@@ -294,12 +299,14 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.loginContentTitle{
font-size: 14px; .loginContentTitle {
line-height: 32px; font-size: 14px;
margin-right: 10px; line-height: 32px;
text-align: left; margin-right: 10px;
text-align: left;
} }
.qr-contain { .qr-contain {
margin: 0 auto; margin: 0 auto;
/* margin-top: 20px; */ /* margin-top: 20px; */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论