Skip to content

C
company_app
提交 4eac6f60 作者: 毛细亚
操作

更新代码

上级 4c6be1e3
正在显示 包含 138 行增加 和 92 行删除
src/components/loading.vue
......@@ -26,7 +26,7 @@
animation: rotage linear 1s infinite;
}
.text{
color: #00bf8a;
color: #409EFF;
font-size: 14px;
margin-left: 5px;
}
......
src/components/selectTag.vue
......@@ -440,7 +440,7 @@
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #00bf8a;
color: #409EFF;
cursor: pointer;
}
}
......
src/styles/index.scss
......@@ -710,3 +710,13 @@ li {
}
// cascader 样式
.el-cascader__dropdown .el-cascader-panel{
display: flex;
flex-direction: column;
.el-cascader-menu__wrap{
margin-bottom: 0px !important;
}
.el-cascader-menu{
}
}
src/views/ViolationRecord.vue
......@@ -3,7 +3,7 @@
<el-form
v-loading="loading"
class="violationRecordContent"
label-width="100px"
label-width="90px"
>
<div v-if="violationList.length > 0">
<div
......@@ -274,6 +274,9 @@ export default {
border-bottom: 1px dashed #ebeef5;
margin-bottom: 20px;
padding-bottom: 20px;
::v-deep .el-form-item__label{
line-height: 40px;
}
&:last-child {
border-bottom: none;
......@@ -285,7 +288,7 @@ export default {
margin-top: 4px;
p {
line-height: 25px;
line-height: 32px;
}
.label {
......
src/views/components/ApplyRecords/AreaTransferApply.vue
......@@ -496,7 +496,7 @@ export default {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
......@@ -634,8 +634,8 @@ export default {
}
::v-deep .el-step > .is-success {
color: #00bf8a;
border-color: #00bf8a;
color: #409EFF;
border-color: #409EFF;
.el-step__line {
background-color: #e5e6eb;
......@@ -643,12 +643,12 @@ export default {
}
::v-deep .el-step__main > .is-success {
color: #00bf8a;
color: #409EFF;
}
::v-deep .el-step > .is-process {
color: #00bf8a;
border-color: #00bf8a;
color: #409EFF;
border-color: #409EFF;
.el-step__line {
background-color: #e5e6eb;
......@@ -656,7 +656,7 @@ export default {
}
::v-deep .el-step__main > .is-process {
color: #00bf8a;
color: #409EFF;
}
.form-item-btn {
......@@ -677,7 +677,7 @@ export default {
.preview-btn {
cursor: pointer;
font-size: 14px;
color: #00bf8a;
color: #409EFF;
margin: 0 0 0 10px;
i {
......@@ -833,7 +833,7 @@ export default {
}
.info-value-color {
color: #00bf8a;
color: #409EFF;
margin-left: 5px;
}
}
......
src/views/components/ApplyRecords/TerminaTranfer.vue
......@@ -501,7 +501,7 @@ export default {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
......@@ -630,8 +630,8 @@ export default {
}
::v-deep .el-step > .is-success {
color: #00bf8a;
border-color: #00bf8a;
color: #409EFF;
border-color: #409EFF;
.el-step__line {
background-color: #e5e6eb;
......@@ -639,12 +639,12 @@ export default {
}
::v-deep .el-step__main > .is-success {
color: #00bf8a;
color: #409EFF;
}
::v-deep .el-step > .is-process {
color: #00bf8a;
border-color: #00bf8a;
color: #409EFF;
border-color: #409EFF;
.el-step__line {
background-color: #e5e6eb;
......@@ -652,7 +652,7 @@ export default {
}
::v-deep .el-step__main > .is-process {
color: #00bf8a;
color: #409EFF;
}
.form-item-btn {
......@@ -673,7 +673,7 @@ export default {
.preview-btn {
cursor: pointer;
font-size: 14px;
color: #00bf8a;
color: #409EFF;
margin: 0 0 0 10px;
i {
......@@ -829,7 +829,7 @@ export default {
}
.info-value-color {
color: #00bf8a;
color: #409EFF;
margin-left: 5px;
}
}
......
src/views/components/ApplyRecords/addErrorHandle.vue
......@@ -435,7 +435,7 @@
padding-bottom: 100px;
.icon{
font-size:24px;
color:#00bf8a;
color:#409EFF;
cursor: pointer;
}
.numberItem{
......
src/views/components/ApplyRecords/errorHandle.vue
......@@ -336,8 +336,8 @@ export default {
cursor: pointer;
}
.tabSelectItemActive{
color: #00bf8a;
border-bottom: 2px solid #00bf8a;
color: #409EFF;
border-bottom: 2px solid #409EFF;
}
}
.list{
......@@ -406,7 +406,7 @@ export default {
display: inline-block;
width: 8px;
height: 8px;
background: #00bf8a;
background: #409EFF;
border-radius: 5px;
}
.dian2{
......@@ -435,7 +435,7 @@ export default {
}
p{
font-size: 22px;
color: #00bf8a;
color: #409EFF;
}
}
}
......@@ -526,7 +526,7 @@ export default {
background: #E1FFF0;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
.sended{
......@@ -538,7 +538,7 @@ export default {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
}
.noSend{
padding: 0 8px;
......
src/views/components/giftRecord/emailGift.vue
......@@ -488,7 +488,7 @@
display: inline-block;
width: 8px;
height: 8px;
background: #00bf8a;
background: #409EFF;
border-radius: 5px;
}
.dian2 {
......@@ -517,7 +517,7 @@
}
p {
font-size: 22px;
color: #00bf8a;
color: #409EFF;
}
}
}
......@@ -583,7 +583,7 @@
.iconStyle {
font-size: 18px;
cursor: pointer;
color: #00bf8a;
color: #409EFF;
}
.money {
width: 100%;
......@@ -614,7 +614,7 @@
background: #e1fff0;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
}
......
src/views/components/giftRecord/wxGift.vue
......@@ -171,7 +171,7 @@ import Clipboard from 'clipboard'
text-align: justify;
font-style: normal;
i{
color: #00BF8A;
color: #409EFF;
font-size: 14px;
}
}
......
src/views/components/order/orderRefund.vue
......@@ -211,7 +211,7 @@
padding: 0 20px;
.icon {
font-size: 24px;
color: #00bf8a;
color: #409EFF;
cursor: pointer;
}
......
src/views/components/order/refundLog.vue
......@@ -508,8 +508,8 @@
}
.tabSelectItemActive {
color: #00bf8a;
border-bottom: 2px solid #00bf8a;
color: #409EFF;
border-bottom: 2px solid #409EFF;
}
}
......@@ -589,7 +589,7 @@
display: inline-block;
width: 8px;
height: 8px;
background: #00bf8a;
background: #409EFF;
border-radius: 5px;
}
......@@ -622,7 +622,7 @@
p {
font-size: 22px;
color: #00bf8a;
color: #409EFF;
}
}
}
......@@ -686,8 +686,8 @@
background: #fff;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
border: 1px solid #00bf8a;
color: #409EFF;
border: 1px solid #409EFF;
border-radius: 3px;
text-align: center;
margin-left: 20px;
......@@ -738,7 +738,7 @@
background: #e1fff0;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
......@@ -782,7 +782,7 @@
}
.info-value-color {
color: #00bf8a;
color: #409EFF;
margin-left: 5px;
}
......
src/views/components/quickSendGame/sendGame.vue
......@@ -431,7 +431,7 @@ export default {
if (res?.data?.data?.data?.length > 0) {
// 只有一个的时候自动发送渠道链接
this.channelInfoList = {
game_id: items.game_id,
game_id: items.game_id || items.id,
use_type: this.activeName,
sendType: this.sendType,
channelList: res.data.data.data
......@@ -1109,6 +1109,7 @@ export default {
width: 100%;
height: 100%;
overflow: auto;
margin-top: -10px;
.createChannel {
font-size: 14px;
margin-top: 16px;
......@@ -1133,7 +1134,7 @@ export default {
}
.channelLoading {
color: #00bf8a;
color: #409EFF;
font-size: 16px;
text-align: center;
padding: 20px;
......@@ -1284,6 +1285,6 @@ export default {
}
.sendLink:hover {
color: #00bf8a;
color: #409EFF;
}
</style>
\ No newline at end of file
src/views/components/quickSendGame/sendGame/mainGame.vue
......@@ -2,7 +2,7 @@
<el-cascader
v-model="reg_game_id"
:options="regGameList"
:props="{expandTrigger: 'hover',label:'full_label',emitPath:false }"
:props="{label:'full_label',emitPath:false }"
collapse-tags
clearable
multiple
......
src/views/components/quickSendGame/sendGame/selectChannel.vue
......@@ -9,6 +9,7 @@
<div class="editLayer">
<el-form
:model="webForm"
label-position="top"
label-width="100px"
>
<el-form-item label="选择渠道">
......@@ -18,7 +19,7 @@
value-key="key"
filterable
placeholder="请选择"
style="width:320px;"
style="width:100%;"
>
<el-option
v-for="item in channelInfoList.channelList"
......@@ -35,10 +36,12 @@
<el-button
class="btn"
type="primary"
size="small"
@click="onConfirm"
>确 定</el-button>
<el-button
class="btn"
size="small"
@click="close"
>取 消</el-button>
</span>
......@@ -314,6 +317,9 @@ export default {
}
</script>
<style lang="scss" scoped>
.editLayer{
padding: 0 20px;
}
.dialog-footer {
width: calc(100% - 20px);
height: 52px;
......
src/views/components/quickSendGame/vipTools.vue
......@@ -81,6 +81,7 @@
<el-button
size="mini"
type="primary"
:loading="loading"
@click="sendGameCode(items)"
>发送礼包码</el-button>
</div>
......@@ -106,7 +107,8 @@
return {
disabled: true,
showGameCode: false,
giftCodeGame: []
giftCodeGame: [],
loading: false
}
},
mounted() {
......@@ -228,6 +230,7 @@
},
// 发送渠道
async sendGameCode(items) {
this.loading = true
const data = {
userid: this.chatUserInfo.userid,
external_userid: this.chatUserInfo.external_userid,
......@@ -240,8 +243,9 @@
this.$message.success('发送成功')
this.sendChatMessage(res.data,'text')
} else {
this.$message.error('发送失败')
this.$message.error(res.msg || '发送失败')
}
this.loading = false
},
handleAccount() {
if (this.bindGameUserList.length > 0) {
......@@ -296,7 +300,7 @@
cursor: pointer;
}
.sendLink:hover {
color: #00bf8a;
color: #409EFF;
}
.giftGameCollapse {
width: 100%;
......@@ -319,7 +323,7 @@
border-right: 1px solid #ccc;
}
.btnActive {
background: #00bf8a;
background: #409EFF;
color: #fff;
}
}
......
src/views/components/roleInfo/approval.vue
<template>
<div class="approval-role-list columnFlex">
<el-form ref="taskForm" :model="reportForm" :inline="true" class="taskForm" label-width="85px">
<el-form ref="taskForm" :model="reportForm" label-position="top" class="taskForm" label-width="85px">
<el-form-item label="角色名称">
<el-input
v-model="reportForm.role_name"
......@@ -14,6 +14,7 @@
<el-select
v-model="reportForm.approval_status"
clearable
style="width: 100%;"
placeholder="请选择审批状态"
@change="filterChange"
>
......@@ -25,6 +26,7 @@
<el-select
v-model="reportForm.register_type"
clearable
style="width: 100%;"
placeholder="请选择申请方式"
@change="filterChange"
>
......@@ -85,7 +87,7 @@
class="mailListScroll"
>
<!-- 举报申请 -->
<div class="scrollMain">
<div class="scrollMain" v-if="reportList.length > 0">
<div v-for="(item, index) in reportList" :key="index" class="reportContent" @click="appealProcess(item, index)">
<div class="reportItem rowFlex columnCenter spaceBetween">
<div class="reportItemLeft">
......@@ -219,6 +221,9 @@
</el-collapse-transition>
</div>
</div>
<div v-else class="noContent">
<noContent />
</div>
</div>
<el-dialog :visible.sync="dialogRemarkVisible" top="50%" center append-to-body title="查看大图" custom-class="remake-dialog">
<div class="remake-box">
......@@ -244,7 +249,7 @@
import shenpi3 from '@/assets/icon/shenpi3.svg'
import shenpi4 from '@/assets/icon/shenpi4.svg'
import shenpi5 from '@/assets/icon/shenpi5.svg'
import noContent from "@/components/noContent.vue";
import noContent from "@/components/noContent.vue";
import watchMember from '@/mixins/watchMember'
export default {
computed: {
......
src/views/components/roleInfo/report.vue
......@@ -4,13 +4,12 @@
ref="taskForm"
:model="reportForm"
class="taskForm"
label-position="top"
label-width="85px"
>
<el-form-item label="角色名称">
<el-input
v-model="reportForm.role_name"
style="width:95%;"
clearable
placeholder="请输入角色名称"
@change="filterChange"
......@@ -20,7 +19,7 @@
<el-form-item label="审批状态">
<el-select
v-model="reportForm.approval_status"
style="width:95%;"
style="width:100%;"
clearable
placeholder="请选择审批状态"
@change="filterChange"
......@@ -37,7 +36,7 @@
<el-form-item label="申请方式">
<el-select
v-model="reportForm.register_type"
style="width:95%;"
style="width:100%;"
clearable
placeholder="请选择申请方式"
@change="filterChange"
......@@ -59,7 +58,7 @@
class="mailListScroll"
>
<!-- 举报申请 -->
<div class="scrollMain">
<div class="scrollMain" v-if="reportList.length > 0">
<div
v-for="(item, index) in reportList"
:key="index"
......@@ -241,6 +240,9 @@
</el-collapse-transition>
</div>
</div>
<div v-else class="noContent">
<noContent />
</div>
</div>
<el-dialog
:visible.sync="dialogRemarkVisible"
......@@ -280,6 +282,7 @@
import shenpi3 from '@/assets/icon/shenpi3.svg'
import shenpi4 from '@/assets/icon/shenpi4.svg'
import shenpi5 from '@/assets/icon/shenpi5.svg'
import noContent from '@/components/noContent.vue'
export default {
computed: {
...mapState('game', ['accountSelect']),
......@@ -294,7 +297,8 @@
},
components: {
resubmitReport,
approvalTask
approvalTask,
noContent
},
data() {
return {
......@@ -512,7 +516,7 @@
<style lang="scss" scoped>
.reportList {
width: 100%;
height: calc(100% - 60px);
height: 100%;
overflow: auto;
.taskForm {
......@@ -569,7 +573,7 @@
.mailListScroll {
width: 100%;
height: calc(100vh - 220px);
height: calc(100% - 250px);
overflow-y: auto;
overflow-x: hidden;
......
src/views/components/skill/aiLibrary.vue
......@@ -518,11 +518,11 @@ export default {
cursor: pointer;
.iconDown {
transform: rotate(-90deg);
color: #00bf8a;
color: #409EFF;
margin-right: 2px;
}
p {
color: #00bf8a;
color: #409EFF;
font-size: 12px;
}
}
......@@ -599,7 +599,7 @@ export default {
background: #ffffff;
border: 1px solid transparent;
border-radius: 6px;
border: 1px solid #00bf8a;
border: 1px solid #409EFF;
background-origin: border-box;
background-clip: content-box, border-box;
float: left;
......
src/views/components/skill/skillCompany.vue
......@@ -403,7 +403,7 @@ export default {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
margin-right: 10px;
}
.button {
......@@ -566,7 +566,7 @@ export default {
}
}
.tagItemActive {
color: #00bf8a;
color: #409EFF;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
background: #e4fff1;
......
src/views/components/skill/skillLibrary.vue
......@@ -307,7 +307,7 @@ export default {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
margin-right: 10px;
}
.button {
......@@ -475,13 +475,13 @@ export default {
}
}
.tagItemActive {
color: #00bf8a !important;
color: #409EFF !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
background: #e4fff1;
}
.tagItemActiveText {
color: #00bf8a;
color: #409EFF;
}
}
.libraryListContent{
......@@ -554,7 +554,7 @@ export default {
}
.copyIcon {
width: 20px;
color: #00bf8a;
color: #409EFF;
font-size: 16px;
position: relative;
top: 2px;
......
src/views/components/skill/skillPersonal.vue
......@@ -400,7 +400,7 @@ export default {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
margin-right: 10px;
}
.button {
......@@ -563,7 +563,7 @@ export default {
}
}
.tagItemActive {
color: #00bf8a;
color: #409EFF;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
background: #e4fff1;
......
src/views/giftRecord.vue
......@@ -20,7 +20,7 @@ export default {
EmailGift,
WxGift
},
mounted(){
created(){
this.initializeWecom()
},
methods: {
......
src/views/orderList.vue
......@@ -38,21 +38,21 @@
<div class="filterList">
<el-form class="filterList" label-position="top">
<el-form-item label="订单号:">
<el-input v-model="inputValue" placeholder="请输入订单号/交易单号" prefix-icon="el-icon-search" style="width: 70%" clearable @change="searchInput"></el-input>
<el-input v-model="inputValue" placeholder="请输入订单号/交易单号" prefix-icon="el-icon-search" style="width: 100%" clearable @change="searchInput"></el-input>
</el-form-item>
<el-form-item label="支付方式:">
<el-select v-model="pay_type" collapse-tags multiple clearable placeholder="请选择支付方式" style="width: 70%; margin-bottom: 10px" @change="payTypeResult">
<el-select v-model="pay_type" collapse-tags multiple clearable placeholder="请选择支付方式" style="width: 100%; margin-bottom: 10px" @change="payTypeResult">
<el-option v-for="item in payList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="下单时间:">
<selectDate :width="'69%'" :defaultValue="searchDate" @result="dateResult"/>
<selectDate :width="'100%'" :defaultValue="searchDate" @result="dateResult"/>
</el-form-item>
<el-form-item label="角色名称:" >
<searchSelect style="width: 70%" placeholder="请输入角色名称" @result="selectResult" />
<searchSelect style="width: 100%" placeholder="请输入角色名称" @result="selectResult" />
</el-form-item>
</el-form>
</div>
......@@ -241,10 +241,10 @@
mounted() {
this.payTypeList()
this.searchDate = [
this.$moment().subtract(3, 'month').format('YYYY-MM-DD'),
this.$moment().subtract(1, 'day').format('YYYY-MM-DD'),
this.$moment().format('YYYY-MM-DD')
]
this.timerData.order_time_start = this.$moment().subtract(3, 'month').format('YYYY-MM-DD')
this.timerData.order_time_start = this.$moment().subtract(1, 'day').format('YYYY-MM-DD')
this.timerData.order_time_end = this.$moment().format('YYYY-MM-DD')
},
methods: {
......@@ -474,8 +474,8 @@
line-height: 40px;
}
.tabSelectItemActive {
color: #00bf8a;
border-bottom: 2px solid #00bf8a;
color: #409EFF;
border-bottom: 2px solid #409EFF;
}
}
.contentItem {
......@@ -534,7 +534,7 @@
display: inline-block;
width: 8px;
height: 8px;
background: #00bf8a;
background: #409EFF;
border-radius: 5px;
}
.dian2 {
......@@ -561,7 +561,7 @@
}
p {
font-size: 22px;
color: #00bf8a;
color: #409EFF;
}
}
}
......@@ -652,7 +652,7 @@
background: #e1fff0;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
.btnRefund{
......
src/views/roleInfo.vue
......@@ -52,5 +52,16 @@ export default {
width: 100%;
height: 100%;
background: #fff;
// tab 样式
::v-deep .el-tabs,
::v-deep .el-tab-pane {
width: 100%;
height: 100%;
}
::v-deep .el-tabs__content{
height: calc(100% - 60px);
}
}
</style>
\ No newline at end of file
src/views/taskRecord.vue
......@@ -492,8 +492,8 @@ export default {
cursor: pointer;
}
.tabSelectItemActive {
color: #00bf8a;
border-bottom: 2px solid #00bf8a;
color: #409EFF;
border-bottom: 2px solid #409EFF;
}
}
.contentItem {
......@@ -556,7 +556,7 @@ export default {
display: inline-block;
width: 8px;
height: 8px;
background: #00bf8a;
background: #409EFF;
border-radius: 5px;
}
.dian2 {
......@@ -585,7 +585,7 @@ export default {
}
p {
font-size: 22px;
color: #00bf8a;
color: #409EFF;
}
}
}
......@@ -673,7 +673,7 @@ export default {
background: #e1fff0;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
border: none;
}
.sended {
......@@ -685,7 +685,7 @@ export default {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00bf8a;
color: #409EFF;
}
.noSend {
padding: 0 8px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论