Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

This commit is contained in:
From-wh 2023-02-24 16:02:54 +08:00
commit 92df1b98f8
2 changed files with 10 additions and 9 deletions

View File

@ -1,7 +1,6 @@
<template>
<div>
<div class="i-layout-page-header">
<div class="i-layout-page-header">
<div class="i-layout-page-header pt10">
<span class="ivu-page-header-title" v-if="!isShowList">短信账户</span>
<div v-if="isShowList" class="acea-row row-between-wrapper picTxt">
<div slot="content">
@ -83,9 +82,8 @@
</div>
</div>
</div>
</div>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<Card :bordered="false" dis-hover class="ivu-mt" style="min-height: 600px">
<login-from
@on-change="onChangePasssword"
v-if="isShowLogn"

View File

@ -1,6 +1,9 @@
<template>
<div class="message">
<div class="table-box" style="padding-bottom: 0">
<div >
<div class="i-layout-page-header header_top">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
<div class="message">
<Card :bordered="false" dis-hover class="">
<div class="mb20">
<Tabs v-model="currentTab" @on-click="changeTab">
@ -42,7 +45,7 @@
</template>
</Card>
</div>
<div class="table-box" style="padding-top: 10px" v-if="currentTab == 1">
<div class="pt10" v-if="currentTab == 1">
<Card :bordered="false" dis-hover class="ivu-mt">
<Row type="flex">
<Col span="24">
@ -322,8 +325,8 @@
</Card>
</div>
<!-- 缩略图配置 -->
<div class="table-box" style="padding-top: 10px" v-else-if="currentTab == 5"></div>
<div class="table-box" style="padding-top: 10px" v-else>
<div class="pt10" v-else-if="currentTab == 5"></div>
<div class="pt10" v-else>
<Card :bordered="false" dis-hover class="ivu-mt">
<Row type="flex" class="mb20">
<Col span="24">