Skip to content

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

Merge branch '1.1' into 1.2

上级 c298460c b4a77d03
正在显示 包含 519 行增加 和 48 行删除
src/styles/index.scss
......@@ -61,6 +61,44 @@ div:focus {
outline: none;
}
/* 统一Tab样式 */
.el-tabs__item {
color: #333333;
height: 40px;
line-height: 40px;
}
.el-tabs__item.is-active {
color: #3491FA;
}
.el-tabs__active-bar {
background-color: #3491FA;
}
/* 移除tab的阴影效果 */
.el-tabs--border-card {
box-shadow: none !important;
border: none !important;
}
.el-tabs__nav-wrap::after {
height: 1px;
background-color: #e4e7ed;
}
/* 统一下拉框高度 */
.el-select-dropdown__item {
height: 32px;
line-height: 32px;
}
/* 统一输入框样式 */
.el-input__inner {
height: 32px !important;
line-height: 32px !important;
}
.clearfix {
&:after {
visibility: hidden;
......@@ -720,3 +758,78 @@ li {
.el-cascader-menu{
}
}
/* 统一账号列表样式 */
.account-select {
height: 32px !important;
line-height: 32px !important;
.el-input__inner {
height: 32px !important;
line-height: 32px !important;
}
}
/* 统一表单样式 */
.form-item {
margin-bottom: 16px;
.el-form-item__label {
line-height: 32px;
padding-right: 12px;
}
.el-input__inner,
.el-textarea__inner {
border-radius: 4px;
border-color: #d9d9d9;
&:focus {
border-color: #3491FA;
}
}
.el-select {
width: 100%;
}
}
/* 统一标签颜色 */
.el-tag--info {
background-color: #e9e9e9;
border-color: #d9d9d9;
color: #86909c;
}
/* 统一弹窗样式 */
.el-dialog {
border-radius: 8px;
overflow: hidden;
.el-dialog__header {
background-color: #f7f8fa;
padding: 16px 20px;
border-bottom: 1px solid #e4e7ed;
}
.el-dialog__body {
padding: 20px;
}
.el-dialog__footer {
border-top: 1px solid #e4e7ed;
padding: 12px 20px;
}
}
/* 统一表格样式 */
.el-table {
border-radius: 4px;
overflow: hidden;
.el-table__header-wrapper th {
background-color: #f7f8fa;
color: #333;
font-weight: 500;
}
}
src/views/ViolationRecord.vue
......@@ -298,16 +298,24 @@ export default {
}
.error {
color: #ff5959;
color: #f56c6c;
}
.hit-statistics-table {
margin-top: 10px;
margin-bottom: 20px;
::v-deep .el-table__header-wrapper th {
background-color: #f7f8fa;
}
::v-deep .el-button--text {
color: #3491FA;
}
}
::v-deep .el-form-item {
margin-bottom: 5px;
margin-bottom: 8px;
}
::v-deep .el-form-item__label {
......@@ -318,6 +326,38 @@ export default {
::v-deep .el-form-item__content {
color: #333;
}
.title {
color: #333;
font-size: 16px;
position: relative;
padding-left: 10px;
&:before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 3px;
height: 16px;
background-color: #3491FA;
border-radius: 3px;
}
}
::v-deep .el-dialog__header {
padding: 15px 20px;
background-color: #f7f8fa;
}
::v-deep .el-button--text {
color: #3491FA;
&:hover {
color: #5ba8fb;
}
}
}
.remakeDetails {
......@@ -325,6 +365,7 @@ export default {
::v-deep img {
max-width: 200px;
max-height: 200px;
border-radius: 4px;
}
}
......
src/views/components/bindGameAccount/bindUserList.vue
......@@ -155,19 +155,26 @@ export default {
.select {
::v-deep .el-input--small .el-input__inner {
// border-radius: 16px;
border: none;
// color: $color;
border-radius: 4px;
border: 1px solid #e4e7ed;
min-width: 200px;
height: 30px;
line-height: 30px;
background: #ecfff6;
color: #3491FA ;
height: 32px;
line-height: 32px;
background-color: #E8F7FF;
color: #3491FA;
font-size: 14px;
&:hover, &:focus {
border-color: #3491FA;
}
}
::v-deep .el-input__suffix {
// display: none;
color: #3491FA ;
color: #3491FA;
}
::v-deep .el-select-dropdown__item.selected {
color: #3491FA;
}
}
......@@ -179,5 +186,15 @@ export default {
white-space: nowrap;
color: #F53F3F;
}
::v-deep .el-button--danger {
background-color: #F56C6C;
border-color: #F56C6C;
&:hover, &:focus {
background-color: #f78989;
border-color: #f78989;
}
}
}
</style>
\ No newline at end of file
src/views/components/quickSendGame/sendGame.vue
......@@ -1134,7 +1134,7 @@ export default {
}
.channelLoading {
color: #409EFF;
color: #3491FA;
font-size: 16px;
text-align: center;
padding: 20px;
......@@ -1158,6 +1158,7 @@ export default {
::v-deep .el-radio-button {
flex: 1;
&__inner {
width: 100%;
height: 100%;
......@@ -1197,8 +1198,8 @@ export default {
}
::v-deep .el-button {
background: #1890ff;
border-color: #1890ff;
background: #3491FA;
border-color: #3491FA;
color: #fff;
font-size: 14px;
height: 32px;
......@@ -1206,8 +1207,8 @@ export default {
border-radius: 4px;
&:hover {
background: #40a9ff;
border-color: #40a9ff;
background: #5ba8fb;
border-color: #5ba8fb;
}
&:disabled {
......@@ -1219,13 +1220,13 @@ export default {
::v-deep .el-popover__reference {
.el-button {
background: #1890ff;
border-color: #1890ff;
background: #3491FA;
border-color: #3491FA;
color: #fff;
&:hover {
background: #40a9ff;
border-color: #40a9ff;
background: #5ba8fb;
border-color: #5ba8fb;
}
}
}
......@@ -1243,11 +1244,11 @@ export default {
.el-input__inner {
border-radius: 6px;
border: 1px solid #d9d9d9;
height: 40px;
height: 36px;
font-size: 14px;
&:focus {
border-color: #1890ff;
border-color: #3491FA;
}
}
......@@ -1275,16 +1276,28 @@ export default {
box-shadow: none;
}
}
/* 统一collapse样式 */
::v-deep .el-collapse-item__header {
background-color: #F7F8FA;
.el-collapse-item__arrow {
color: #3491FA;
}
}
}
</style>
<style>
.sendLink {
width: 150px;
height: 25px;
height: 32px;
line-height: 32px;
cursor: pointer;
padding: 0 5px;
}
.sendLink:hover {
color: #409EFF;
color: #3491FA;
background-color: #f5f7fa;
}
</style>
\ No newline at end of file
src/views/components/skill/skillPersonal.vue
......@@ -612,5 +612,49 @@ export default {
.skillTab {
width: 100%;
height: calc(100% - 60px);
.inputContent {
width: 100%;
padding: 0 15px;
margin-bottom: 15px;
::v-deep .el-input {
width: 100%;
.el-input__inner {
border-radius: 4px;
height: 36px !important;
}
.el-input-group__append {
background-color: #3491FA;
border-color: #3491FA;
color: #fff;
}
}
}
}
// 标签样式修改
.tagList {
.tagItem {
transition: all 0.3s ease;
&:hover {
background-color: #f5f7fa;
}
}
.tagItemActive {
color: #3491FA !important;
background: #E8F7FF !important;
font-weight: 500 !important;
}
}
// 发送按钮样式
.sendButton {
background-color: #3491FA !important;
color: white !important;
border-color: #3491FA !important;
}
</style>
src/views/giftRecord.vue
......@@ -49,9 +49,34 @@ export default {
height: 100%;
padding-top: 10px;
background: #fff;
::v-deep .el-tabs .el-tabs__header{
::v-deep .el-tabs {
.el-tabs__header {
margin: 0;
// height: 60px;
padding: 0 15px;
}
.el-tabs__item {
height: 40px;
line-height: 40px;
font-size: 16px;
color: #333333;
&.is-active {
color: #3491FA;
}
}
.el-tabs__active-bar {
background-color: #3491FA;
height: 3px;
border-radius: 1.5px;
}
.el-tabs__nav-wrap::after {
height: 1px;
background-color: #e4e7ed;
}
}
}
</style>
\ No newline at end of file
src/views/quickReply.vue
......@@ -93,6 +93,14 @@ export default {
background: #fff;
::v-deep .el-tabs__item {
padding: 0 15px;
font-size: 16px;
}
::v-deep .el-tabs__active-bar {
height: 3px;
border-radius: 1.5px;
}
::v-deep .el-tabs__header {
padding: 0 15px;
}
.detailsTitle {
width: 100%;
......
src/views/roleInfo.vue
......@@ -52,16 +52,47 @@ export default {
width: 100%;
height: 100%;
background: #fff;
// tab 样式
::v-deep .el-tabs,
::v-deep .el-tab-pane {
::v-deep .el-tabs {
width: 100%;
height: 100%;
}
::v-deep .el-tabs__content{
height: calc(100% - 60px);
}
.el-tabs__header {
margin: 0;
padding: 0 15px;
}
.el-tabs__item {
height: 40px;
line-height: 40px;
font-size: 16px;
color: #333333;
&.is-active {
color: #3491FA;
}
}
.el-tabs__active-bar {
background-color: #3491FA;
height: 3px;
border-radius: 1.5px;
}
.el-tabs__nav-wrap::after {
height: 1px;
background-color: #e4e7ed;
}
.el-tab-pane {
width: 100%;
height: 100%;
}
.el-tabs__content {
height: calc(100% - 40px);
padding: 15px;
}
}
}
</style>
\ No newline at end of file
src/views/userInfo/components/Info.vue
......@@ -157,17 +157,40 @@
"
class="tags rowFlex columnCenter flexWarp"
>
<div
v-for="(item, index) in chatUserDetails.tag_group"
:key="index"
class="tagsItem rowFlex columnCenter flexWarp"
>
<!-- 第一个标签组的所有标签 -->
<div class="tagsItem rowFlex columnCenter flexWarp">
<span
v-for="(items, indexs) in item.tag"
v-for="(items, indexs) in chatUserDetails.tag_group[0].tag"
:key="indexs"
class="tag hidden"
>{{ items.name }}</span>
</div>
<!-- 如果有多个标签组，显示+n -->
<el-popover
v-if="chatUserDetails.tag_group.length > 1"
placement="top"
trigger="hover"
popper-class="tag-popover"
>
<div class="groups-popover-content" style="max-height: 600px;overflow-y: auto;">
<div
v-for="(group, groupIndex) in chatUserDetails.tag_group.slice(1)"
:key="groupIndex"
class="group-item"
>
<span
v-for="(tagItem, tagIndex) in group.tag"
:key="tagIndex"
class="tag-item"
>{{ tagItem.name }}</span>
</div>
</div>
<span
slot="reference"
class="tag-more"
>+{{ chatUserDetails.tag_group.length - 1 }}</span>
</el-popover>
</div>
</div>
<i class="el-icon-edit icon" style="font-size: 14px;margin-right: 10px;"
......@@ -792,4 +815,73 @@ import { getToken,removeToken } from '@/utils/auth'
.flexWarp {
flex-wrap: wrap;
}
.tag-more {
display: inline-block;
background-color: #E8F7FF;
color: #3491FA;
padding: 2px 8px;
border-radius: 2px;
margin-left: 5px;
font-size: 12px;
cursor: pointer;
transition: all 0.3s;
&:hover {
background-color: #d0edff;
}
}
.tags-popover-content {
display: flex;
flex-wrap: wrap;
max-width: 200px;
.tag-item {
background-color: #f5f5f5;
color: #666;
padding: 2px 8px;
border-radius: 2px;
margin-right: 5px;
margin-bottom: 5px;
font-size: 12px;
}
}
.groups-popover-content {
display: flex;
flex-direction: column;
max-width: 300px;
.group-item {
display: flex;
flex-wrap: wrap;
margin-bottom: 8px;
padding-bottom: 8px;
border-bottom: 1px dashed #eee;
&:last-child {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
.tag-item {
background-color: #f5f5f5;
color: #666;
padding: 2px 8px;
border-radius: 2px;
margin-right: 5px;
margin-bottom: 5px;
font-size: 12px;
}
}
}
</style>
<style>
.tag-popover {
min-width: 200px;
max-width: 300px;
}
</style>
\ No newline at end of file
src/views/userInfo/components/shareInfo.vue
<template>
<div class="newPage">
<!-- 共享信息 -->
<div v-if="userList.length > 0" class="item columnFlex spaceBetween">
<div v-if="userList.length > 0" class="item rowFlex columnCenter">
<!-- <div class="rowFlex columnCenter">
<span class="label">共享信息:</span>
<i style="margin-left: 10px; font-size: 20px; color: #0ac358; cursor: pointer" class="el-icon-circle-plus-outline" type="primary" @click="addGroupText"></i>
</div> -->
<div v-for="(i,k) in userList" :key="k" class="userList rowFlex ">
<p class="label hidden">{{ i.zq_user_name }} -- {{ i.name }}</p>
<!-- 显示第一个用户的共享信息 -->
<div v-if="userList.length > 0" class="userList rowFlex">
<p class="label hidden">{{ userList[0].zq_user_name }} -- {{ userList[0].name }}</p>
<div style="margin-bottom:10px;" class="columnFlex ">
<div v-for="(item,index) in i.text" :key="index+'1'" class="keyWordsItem rowFlex columnCenter">
<el-input v-model="item.text" type="textarea" :disabled="chatUserDetails.userid !== i.userid || i.zq_user_id!== userInfo.id" placeholder="请输入共享信息" @change="inputBlur(k,index)"> </el-input>
<div v-if="chatUserDetails.userid == i.userid && i.zq_user_id=== userInfo.id">
<i v-if="index==0" style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-circle-plus-outline" type="primary" @click="addInputItem(k,index)"></i>
<i v-else style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-remove-outline" type="primary" @click="removeInput(k,index)"></i>
<div v-for="(item,index) in userList[0].text" :key="index+'1'" class="keyWordsItem rowFlex columnCenter">
<el-input v-model="item.text" type="textarea" :disabled="chatUserDetails.userid !== userList[0].userid || userList[0].zq_user_id!== userInfo.id" placeholder="请输入共享信息" @change="inputBlur(0,index)"> </el-input>
<div v-if="chatUserDetails.userid == userList[0].userid && userList[0].zq_user_id=== userInfo.id">
<i v-if="index==0" style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-circle-plus-outline" type="primary" @click="addInputItem(0,index)"></i>
<i v-else style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-remove-outline" type="primary" @click="removeInput(0,index)"></i>
</div>
</div>
</div>
</div>
<!-- 如果有多个用户，显示+n -->
<el-popover
v-if="userList.length > 1"
placement="bottom"
trigger="hover"
popper-class="share-info-popover"
>
<div class="share-info-popover-content" style="max-height: 600px; overflow-y: auto;">
<div v-for="(user, userIndex) in userList.slice(1)" :key="userIndex" class="share-info-user">
<p class="share-info-username">{{ user.zq_user_name }} -- {{ user.name }}</p>
<div class="share-info-items">
<div v-for="(item, itemIndex) in user.text" :key="itemIndex" class="share-info-item">
<el-input
v-model="item.text"
type="textarea"
:disabled="chatUserDetails.userid !== user.userid || user.zq_user_id !== userInfo.id"
placeholder="请输入共享信息"
@change="inputBlur(userIndex + 1, itemIndex)"
></el-input>
<div v-if="chatUserDetails.userid == user.userid && user.zq_user_id === userInfo.id">
<i v-if="itemIndex==0" style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-circle-plus-outline" @click="addInputItem(userIndex + 1, itemIndex)"></i>
<i v-else style="margin-left:10px;font-size:20px;color:#0AC358;cursor: pointer;" class="el-icon-remove-outline" @click="removeInput(userIndex + 1, itemIndex)"></i>
</div>
</div>
</div>
</div>
</div>
<div slot="reference" class="more-users-button">+{{ userList.length - 1 }}</div>
</el-popover>
</div>
</div>
</template>
......@@ -200,7 +230,6 @@
}
.userList{
width: 100%;
height: auto;
margin-top: 20px;
.label{
......@@ -211,6 +240,58 @@
margin-bottom: 20px;
}
}
.more-users-button {
display: inline-block;
background-color: #E8F7FF;
color: #3491FA;
padding: 4px 8px;
border-radius: 4px;
margin-top: 10px;
margin-left: 16px;
font-size: 13px;
cursor: pointer;
transition: all 0.3s;
&:hover {
background-color: #d0edff;
}
}
}
</style>
<style>
.share-info-popover {
min-width: 300px;
max-width: 360px;
}
.share-info-popover-content .share-info-user {
margin-bottom: 15px;
padding-bottom: 15px;
border-bottom: 1px dashed #eee;
}
.share-info-popover-content .share-info-user:last-child {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
.share-info-popover-content .share-info-username {
font-weight: bold;
margin-bottom: 8px;
color: #333;
}
.share-info-popover-content .share-info-item {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.share-info-popover-content .share-info-item:last-child {
margin-bottom: 0;
}
</style>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论