github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-01 15:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
吴昊天 2023-02-24 15:17:32 +08:00
commit bc493ea77a
11 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
template/admin/src/components/main/components/header-search/index.vue
View File

@ -19,22 +19,22 @@
</Select>
</div>
</template>
<style>
.search .ivu-select-selection {
<style scoped>
.search /deep/ .ivu-select-selection {
margin-right: 20px;
border-radius: 30px;
}
.search .ivu-select-visible .ivu-select-selection {
.search /deep/ .ivu-select-visible .ivu-select-selection {
box-shadow: unset !important;
}
.search li.ivu-select-item {
.search /deep/ li.ivu-select-item {
text-align: left;
}
.search .select .ivu-select-input,
.search .select .ivu-select-item {
.search /deep/ .select .ivu-select-input,
.search /deep/ .select .ivu-select-item {
font-size: 13px !important;
}
.search .ivu-select-input{
.search /deep/ .ivu-select-input{
padding-left: 19px;
border-radius: 30px;
background-color: rgba(255,255,255,0.3);

10
template/admin/src/components/main/components/side-menu/side-menu.vue
View File

@ -246,6 +246,7 @@ export default {
},
};
</script>
<style lang="less" scoped></style>
<style lang="less">
@import './side-menu.less';
.ivu-menu {
@ -338,6 +339,14 @@ export default {
color: #fff !important;
border-radius: 4px;
}
.ivu-menu-vertical .ivu-menu-item:hover {
color: #1890ff !important;
background-color: rgba(24, 144, 255, 0.1) !important;
border-radius: 4px;
.ivu-icon {
color: #1890ff !important;
}
}
.ivu-menu-vertical .ivu-menu-item {
padding: 10px 10px;
margin-bottom: 8px;
@ -438,6 +447,7 @@ export default {
white-space: nowrap;
}
}
.drop-menu-a {
padding: 0;
}

4
template/admin/src/pages/app/wechat/menus/index.vue
View File

@ -1,9 +1,7 @@
<template>
<div class="article-manager">
<div class="i-layout-page-header">
<div class="i-layout-page-header">
<div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<!-- 公众号设置 -->

3
template/admin/src/pages/app/wechat/reply/follow.vue
View File

@ -1,5 +1,8 @@
<template>
<div>
<div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<!-- 公众号设置 -->
<Row :gutter="24" type="flex">

2
template/admin/src/pages/finance/billingRecords/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<Card :bordered="false" dis-hover class="ive-mt tablebox">
<Card :bordered="false" dis-hover class="ive-mt">
<div class="ive-mt tabbox">
<Tabs @on-click="onClickTab" class="mb20">
<TabPane label="日账单" name="day" />

16
template/admin/src/pages/marketing/lottery/create.vue
View File

@ -1,21 +1,5 @@
<template>
<div>
<div class="i-layout-page-header header_top">
<div class="i-layout-page-header fl_header">
<!-- <router-link :to="{ path: '/admin/marketing/lottery/index' }"
><Button icon="ios-arrow-back" size="small" type="text"
>返回</Button
></router-link
> -->
<!-- <Divider type="vertical" /> -->
<span
class="ivu-page-header-title mr20"
style="padding: 0"
v-text="$route.params.id ? '编辑抽奖信息' : '添加抽奖信息'"
></span>
</div>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<div>
<Tabs v-model="formValidate.factor" @on-click="onClickTab">

4
template/admin/src/pages/marketing/sign/index.vue
View File

@ -1,5 +1,8 @@
<template>
<div :style="bgcolors">
<div class="i-layout-page-header">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
<div class="box-wrapper">
<div v-if="name == 'sign_day_num'" class="iframe" :bordered="false">
<div class="iframe-box">
@ -1174,7 +1177,6 @@ export default {
padding: 20px;
background-color: #fff;
border-radius: 5px;
margin: 20px;
}
.iview-video-style {

23
template/admin/src/pages/marketing/storeCombination/combinaList.vue
View File

@ -348,12 +348,19 @@ export default {
</script>
<style scoped lang="stylus">
.tabBox_img
width 36px
height 36px
border-radius:4px
cursor pointer
img
width 100%
height 100%
.article-manager{
margin-top: 3px;
}
.tabBox_img{
width: 36px;
height: 36px;
border-radius:4px;
cursor: pointer;
img{
width: 100%;
height: 100%;
}
}
</style>

5
template/admin/src/pages/marketing/storeCombination/index.vue
View File

@ -1,10 +1,5 @@
<template>
<div>
<div class="i-layout-page-header">
<div class="i-layout-page-header">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<Form
ref="formValidate"

5
template/admin/src/pages/setting/setSystem/index.vue
View File

@ -1,4 +1,8 @@
<template>
<div>
<div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
<div class="article-manager">
<Card :bordered="false" dis-hover class="ivu-mt fromBox">
<Tabs v-model="currentTab" @on-click="changeTab" v-if="headerList.length">
@ -22,6 +26,7 @@
<Spin size="large" fix v-if="spinShow"></Spin>
</Card>
</div>
</div>
</template>
<script>

4
template/admin/src/pages/user/grade/right/index.vue
View File

@ -1,8 +1,10 @@
<template>
<div>
<div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
<span class="ivu-page-header-title">{{ $route.meta.title }}</span>
</div>
<Card :bordered="false" dis-hover class="ivu-mt">
<Table
class="mt25"
:columns="thead"
:data="tbody"
:loading="loading"