Skip to content

M
marketing
Commit 732a47a8 by caoyanzhi
Options

update: 样式调整

parent 1b176d1d
Showing with 77 additions and 72 deletions
index.html
......@@ -39,7 +39,7 @@
<!-- 4.0组件库中的组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js"></script><!-- 文件上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js"></script>
</body>
</html>
src/views/card/analysis.vue
......@@ -157,8 +157,7 @@ export default {
<style lang="scss" scoped>
.base {
background: white;
margin-bottom: 24px;
padding: 24px 24px 16px 24px;
padding: 20px;
p.title {
height: 22px;
font-size: 16px;
......@@ -190,16 +189,12 @@ export default {
}
.dm-title__label {
display: flex;
padding: 0 24px 13px 24px;
width: 100%;
margin: 0 0 20px -24px;
margin: 0 0 20px 0;
align-items: center;
font-size: 16px;
font-weight: 500;
color: rgba(48, 49, 51, 1);
line-height: 22px;
}
.dm-form__wrap {
padding: 13px 24px 20px 24px !important;
}
</style>
src/views/card/record-get.vue
......@@ -2,7 +2,7 @@
<section class="card-record-get" v-loading="recordLoading">
<div class="page-tip">当天的卡券领取记录数据可在隔天下载完整内容</div>
<!-- 条件筛选区 -->
<div class="pb22">
<div class="pb20">
<el-input clearable v-model="listParams.search" style="width:240px" placeholder="请输入会员信息/卡券代码" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSelfFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="changeShowSelf" />
<card-select-filter v-bind="extraCF" ref="cdf" :cId.sync="listParams.coupCardId" class="w250" @cIdUpdate="refresh" :disabled="listParams.allCouponFlag" />
......
src/views/ecm/current-list.vue
......@@ -13,7 +13,7 @@
<!-- <el-button type="text" @click="goHistory"> 历史记录</el-button> -->
<el-button icon="iconfont icon-icon_yunxiazai" class="fr" type="primary" v-if="buttonLimit" :limit-code="buttonCode" @click="exportCurrentSendDetails"> 导出列表</el-button>
</div>
<div class="dm-wrap">
<div class="dm-wrap" style="padding-top: 0">
<el-table ref="multipleTable" tooltipEffect="light" :data="infoList" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="50" label="序号"></el-table-column>
......@@ -70,7 +70,7 @@
</el-table>
</div>
<div class="dm-wrap">
<el-input v-model="userMemberInfo" class="w250 mb10" placeholder="输入会员昵称/名字/手机号" clearable @change="searchUnder"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="userMemberInfo" class="w250 mb20" placeholder="输入会员昵称/名字/手机号" clearable @change="searchUnder"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column type="index" width="50" label="序号"></el-table-column>
<el-table-column v-for="(v, i) in tableHeader" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
......
src/views/ecm/scan-form.vue
......@@ -140,10 +140,10 @@
</el-form-item>
</section>
</div>
<div style="margin-top:76px;margin: 76px 0 20px 46px;">
<dm-form-bottom>
<el-button @click="$router.go(-1)">返 回</el-button>
<el-button type="primary" @click="submit('form')" v-if="!isInfo">{{ isAdd ? '确认新建' : '保存' }}</el-button>
</div>
</dm-form-bottom>
</el-form>
<!-- 变量弹窗 -->
......
src/views/ecm/scan-log-list.vue
<template>
<section class="dm-wrap" v-loading="loading">
<div class="pb22 clearfix">
<el-date-picker class="w400 ml10" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="扫码开始时间" end-placeholder="扫码结束时间" @change="search"></el-date-picker>
<el-date-picker class="w400" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="扫码开始时间" end-placeholder="扫码结束时间" @change="search"></el-date-picker>
<el-input v-model="listParams.search" class="w200" placeholder="输入会员信息" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" element-loading-text="拼命加载中">
......
src/views/message/addTemp.vue
<template>
<div class="dm-wrap" v-loading="loading">
<el-row :gutter="20" class="mt20">
<el-row :gutter="20">
<el-form label-width="80px" ref="form" :model="form" :rules="rules">
<el-col :span="12">
<el-form-item label="短信签名">
......
src/views/message/form.vue
<template>
<el-form v-loading="loading" style="padding-bottom: 58px">
<section class="dm-form__wrap" style="padding-bottom: 50px">
<el-form v-loading="loading">
<section class="dm-form__wrap">
<div class="pt10 pb20">
<span class="dm-input_label">选择群发客户：</span>
<el-radio v-model="info.memberType" :label="0">客户筛选</el-radio>
......
src/views/message/importSendList.vue
<template>
<section class="dm-wrap" v-loading="loading">
<div class="pb22 clearfix">
<div class="pb10 clearfix">
<span>创建时间</span>
<el-date-picker class="w400 ml10" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<span class="ml20">发送时间</span>
......
src/views/message/record.vue
<template>
<section class="dm-wrap" v-loading="recordLoading">
<div class="page-tip">送达人数、计费条数会在提交完成后5分钟更新，点击详情可查看实时数据。</div>
<div class="page-tip">送达人数、计费条数会在提交完成后 5 分钟更新，点击详情可查看实时数据。</div>
<div class="clearfix pb22">
<el-date-picker class="w250" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-select class="dm-select" v-model="listParams.sendStatus" placeholder="选择发送状态" @change="refresh">
......
src/views/message/temp.vue
......@@ -6,12 +6,12 @@
<el-option v-for="(v, i) in libTypeOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-date-picker class="w250" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="search"></el-date-picker>
<el-input v-model="listParams.content" class="w200" placeholder="输入模板名称/内容" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.content" style="width: 180px" placeholder="输入模板名称/内容" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" v-if="$getButtonLimit($buttonCode.marketingTempAdd)" :limit-code="$buttonCode.marketingTempAdd" @click="addTemp">
新建短信模板<span>（{{ usedCount }}/{{ allUsableCount }}）</span>
</el-button>
<span class="fr pt10 pr20">
<span class="gray fz13">审核未通过也占用模板数，如需更多短信模板请联系商家运营。</span>
<span class="gray fz13">审核未通过也占用模板数，如需更多模板请联系商家运营</span>
</span>
</div>
<el-row :gutter="20">
......
src/views/msg/edit.vue
......@@ -520,9 +520,6 @@ export default {
</script>
<style lang="scss" scoped>
.content {
margin-bottom: 80px;
}
.msg-edit {
&__info {
/deep/ .el-col {
......@@ -605,7 +602,6 @@ export default {
}
}
&__url {
padding: 20px 0;
&--inner {
padding-bottom: 40px;
}
......
src/views/popup/form.vue
......@@ -749,7 +749,7 @@ export default {
</script>
<style lang="scss" scoped>
.dm-wrap {
margin-bottom: 80px !important;
margin-bottom: 40px !important;
}
.line {
box-sizing: content-box;
......
src/views/recharge/account-detail.vue
<template>
<div>
<div class="dm-wrap">
<el-alert type="warning" show-icon :closable="false" style="margin-bottom: 20px;align-items: flex-start;">
<el-alert type="info" show-icon :closable="false" style="margin-bottom: 20px;align-items: flex-start;">
<div slot="title">
多账户模式”下，系统将根据所配置的计费规则将通讯费用按照下方的“独立计费部门”进行汇总核算及扣除费用：<br />
1、计费规则中：费用由“会员所属服务门店”、“导购所在门店”承担时，最终都会根据门店所属的“独立计费部门”进行汇总核算和扣除，若产生费用时会员无服务门店，则由总部承担费用；<br />
......
src/views/recharge/board.vue
......@@ -7,7 +7,7 @@
计费部门筛选框规则：开启多账户计费模式时显示计费部门筛选框； && 超管和部门权限为可见所有的子账号显示计费部门筛选框；
-->
<section class="recharge">
<div class="dm-wrap" style="margin-bottom: 12px">
<div class="dm-wrap" style="margin-bottom: 4px">
<div class="dm-title__label">
账户概览
<div style="float: right">
......@@ -40,89 +40,89 @@
</div>
</div>
</div>
<div class="dm-wrap" style="">
<h3 class="dm-title__label border-top">今日消费</h3>
<div class="dm-wrap" style="border-top:1px solid #E4E7ED">
<h3 class="dm-title__label">今日消费</h3>
<select-depart v-if="config.isMoreAccount && config.showAllDepartment" :data="deparment1" class="mb20" @load="() => load('one')" @getDepartId="id => getDepartId(id, 'one')" @remote-search="val => remoteSearch(val, 'one')" :loading="deparment1.loading" />
<el-row class="recharge-today" :gutter="20" v-loading="loading1">
<el-col :span="6" style="padding: 0 2px">
<div class="recharge-today-item border2 flex_between">
<div class="recharge-today-item border2 flex_start">
<div class="text-center">
<div class="icon-box">
<i class="iconfont icon-wenbenmsg fz36"></i>
</div>
</div>
<div class="flex_between flex1 pl10">
<div class="flex_column">
<p>文本短信</p>
<p>
<div class="flex_column_between">
<p>文本短信</p>
<div class="flex_between">
<span>
<span class="fz22">{{ recharge.messageCount || 0 }}</span>
条
</p>
</span>
<span class="regular-font-color">合计费用：￥{{ (recharge.messageFee / 1000) | amount }}</span>
</div>
<p class="regular-font-color">合计费用：￥{{ (recharge.messageFee / 1000) | amount }}</p>
</div>
</div>
</el-col>
<el-col :span="6" style="padding: 0 2px">
<div class="recharge-today-item border2 flex_between">
<div class="recharge-today-item border2 flex_start">
<div class="text-center">
<div class="icon-box color2">
<i class="iconfont icon-duanxinyzm fz28"></i>
</div>
</div>
<div class="flex_between flex1 pl10">
<div class="flex_column">
<p>短信验证码</p>
<p>
<div class="flex_column_between">
<p>短信验证码</p>
<div class="flex_between">
<span>
<span class="fz22">{{ recharge.smsCount || 0 }}</span>
条
</p>
</span>
<span class="regular-font-color">合计费用：￥{{ (recharge.smsFee / 1000) | amount }}</span>
</div>
<p class="regular-font-color">合计费用：￥{{ (recharge.smsFee / 1000) | amount }}</p>
</div>
</div>
</el-col>
<el-col :span="6" style="padding: 0 2px">
<div class="recharge-today-item border2 flex_between">
<div class="recharge-today-item border2 flex_start">
<div class="text-center">
<div class="icon-box color3">
<i class="iconfont icon-shuangxianghujiao1 fz36"></i>
</div>
</div>
<div class="flex_between flex1 pl10">
<div class="flex_column">
<p>双向呼叫</p>
<p>
<div class="flex_column_between">
<p>双向呼叫</p>
<div class="flex_between">
<span>
<span class="fz22">{{ recharge.callTime || 0 }}</span>
分钟
</p>
</span>
<span class="regular-font-color">合计费用：￥{{ (recharge.callFee / 1000) | amount }}</span>
</div>
<p class="regular-font-color">合计费用：￥{{ (recharge.callFee / 1000) | amount }}</p>
</div>
</div>
</el-col>
<el-col :span="6" style="padding: 0 2px">
<div class="recharge-today-item border2 flex_between">
<div class="recharge-today-item border2 flex_start">
<div class="text-center">
<div class="icon-box color4">
<i class="iconfont icon-AIdianhua fz36"></i>
</div>
</div>
<div class="flex_between flex1 pl10">
<div class="flex_column">
<p>AI电话</p>
<p>
<div class="flex_column_between">
<p>AI电话</p>
<div class="flex_between">
<span>
<span class="fz22">{{ recharge.aiCount || 0 }}</span>
分钟
</p>
</span>
<span class="regular-font-color">合计费用：￥{{ (recharge.aiFee / 1000) | amount }}</span>
</div>
<p class="regular-font-color">合计费用：￥{{ (recharge.aiFee / 1000) | amount }}</p>
</div>
</div>
</el-col>
</el-row>
</div>
<div class="dm-wrap" style="margin-top: 12px">
<div class="dm-wrap" style="padding-top: 0">
<div class="pb22">
<div slot="header" class="clearfix">
<el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')" @click.native="minDate = null"></el-date-picker>
......@@ -419,7 +419,7 @@ export default {
width: 20% !important;
}
&-item {
padding: 20px;
padding: 15px;
margin: 4px;
.icon-box {
width: 60px;
......@@ -513,9 +513,23 @@ export default {
}
}
}
.flex_start {
display: flex;
justify-content: flex-start;
}
.flex_column_between {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
padding-left: 10px;
width: 100%;
}
.flex_between {
display: flex;
justify-content: space-between;
align-items: flex-end;
width: 100%;
}
.flex_column {
display: flex;
......
src/views/recharge/consume.vue
<template>
<section class="recharge">
<div class="dm-form__wrap" v-loading="loading">
<p class="consume-tips" v-if="$route.params.type === 'video'">共消耗流量{{ sumCount }}MB 累计支出{{ sumFee }}元</p>
<p class="consume-tips" v-if="['record', 'call', 'ai-call'].includes($route.params.type)">
<!-- 通话时长：{{ sumCount || 0 }} 秒 -->
<span class="blod">总计消费：{{ sumFee.toFixed(2) }} 元</span>
</p>
<p class="consume-tips" v-else>
成功发送：国内短信{{ localCount || 0 }}条，国外短信{{ sumInternational || 0 }}条
<span class="ml10 blod">总计消费：{{ (sumFee / 1000).toFixed(2) }} 元</span>
</p>
<div class="pb22" style="overflow:hidden;line-height:40px;" v-if="$route.params.type === 'video'">
<!-- 视频资费 -->
<el-date-picker :clearable="false" v-model="dateTimeVideo" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeVideoTime"></el-date-picker>
......@@ -24,15 +33,6 @@
</div>
<el-button v-if="$getButtonLimit($buttonCode.marketingCounsumeExport)" :limit-code="$buttonCode.marketingCounsumeExport" type="primary" class="btn h32" @click="exportDialog.dialogVisible = true"><i class="iconfont icon-xiazai" style="marginRight:6px;fontSize:14px" />导出</el-button>
</div>
<p class="tips" v-if="$route.params.type === 'video'">共消耗流量{{ sumCount }}MB 累计支出{{ sumFee }}元</p>
<p class="tips" v-if="['record', 'call', 'ai-call'].includes($route.params.type)">
<!-- 通话时长：{{ sumCount || 0 }} 秒 -->
<span class="ml10 blod">总计消费：{{ sumFee.toFixed(2) }} 元</span>
</p>
<p class="tips" v-else>
成功发送：国内短信{{ localCount || 0 }}条，国外短信{{ sumInternational || 0 }}条
<span class="ml10 blod">总计消费：{{ (sumFee / 1000).toFixed(2) }} 元</span>
</p>
</div>
<!-- 短信营销 -->
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-if="$route.params.type === 'marketing'">
......@@ -443,7 +443,7 @@ export default {
let width = 250;
switch (this.$route.params.type) {
case 'marketing':
width = 350;
width = 375;
break;
case 'call':
case 'record':
......@@ -827,13 +827,13 @@ export default {
}
}
}
.tips {
.consume-tips {
height: 22px;
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 22px;
margin-top: 16px;
margin-bottom: 16px;
}
.blod {
font-weight: bold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment