Skip to content

M
marketing
Commit e5e0ee27 by zhangmeng
Options

迭代三bug

parent 7c74ca35
Showing with 11 additions and 21 deletions
dist.zip deleted 100644 → 0
File deleted
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.3bd9e2ca32512fc3b984e2b75abfe3a0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.d0b698b7b2e1419bf4f3.js></script><script type=text/javascript src=/marketing/static/js/app.14dae58fbb6e2a9f8adf.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.9af0d08caa1493aa4400be47cf06e429.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.76aaf9254167acf52017.js></script><script type=text/javascript src=/marketing/static/js/app.f13714696d5628e45cdb.js></script></body></html>
\ No newline at end of file
dist/static/js/app.14dae58fbb6e2a9f8adf.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f13714696d5628e45cdb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/test/component/dm-card/index.vue
<template>
<div class="attention-textAndImg-wrap">
<el-dialog title="选择卡券" :visible.sync="dialogCard" width="800px" :before-close="handleCardClose">
<el-dialog title="选择卡券" :visible.sync="dialogCard" width="820px" :before-close="handleCardClose">
<div class="text-img-search clearfix">
<div class="fl">
<el-input placeholder="请输入卡券名/备注名" prefix-icon="el-icon-search" class="search-input" v-model="searchText" @keyup.native="(value) => toSearchInput(value)" clearable @clear="clearInput"></el-input>
<el-input placeholder="请输入卡券名/备注名" prefix-icon="el-icon-search" class="search-input" v-model="searchText" @keyup.native="(value) => toSearchInput(value)" clearable @clear="clearInput"></el-input>
<span class="limit-text">{{limitTips}}{{total}}张。 </span>
</div>
<div class="fr">
......@@ -352,7 +352,7 @@ const formateDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
background: #fff;
}
.search-input{
width: 180px;
width: 200px;
}
.attention-textAndImg-wrap /deep/{
.text-img-search__wrap{
......@@ -370,7 +370,7 @@ const formateDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
}
/deep/.search-input{
width: 180px;
width: 200px;
}
.search-btn{
margin-left: 4px;
......
src/views/card/group-send.vue
......@@ -89,10 +89,10 @@
</div>
</div>
</div>
<div class="ecm-send__tips">
<!-- <div class="ecm-send__tips">
<i class="el-icon-info pl5 gray"></i>
<span class="fz13">若一个智能营销计划中添加多张卡券，{{form.noticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知。</span>
</div>
</div> -->
</el-form-item>
</section>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
......@@ -677,14 +677,4 @@ export default {
}
}
}
.ecm-send__tips{
display: inline-block;
border: 1px solid #B3D8FF;
padding: 10px 20px;
background: #ECF5FF;
margin: 10px;
i {
color: #1890ff;
}
}
</style>
src/views/card/partials/shelf-add.vue
......@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
</el-table>
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[5, 10, 20, 30]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer">
<span class="pr10" v-show="multipleSelection.length>0">已选择{{multipleSelection.length}}张卡券</span>
<el-button @click="close">取 消</el-button>
......
src/views/ecm/addEdit.vue
......@@ -589,7 +589,7 @@ export default {
// 是否禁止发短信 逻辑 => 当用户选择每天发送，且短信模板选择为营销短信时，需要判断定时发送时间是否在08:00至22:00之间，若否则停留在新建计划页面，禁止短信群发并进行提醒。
isMessageForbidden() {
// console.log(this.$refs.marketingEvent.hasMessageInList(),this.form.effectType === 1,this.form.effectTime)
if (this.$refs.marketingEvent.hasMessageInList() && this.form.effectType === 1 && (this.form.effectTime > 22 || this.form.effectTime < 8)) {
if (this.$refs.marketingEvent.hasMessageInList() && this.form.effectType === 1 && (this.form.effectTime >= 22 || this.form.effectTime <= 8)) {
this.$alert(`<div>
<i class="el-icon-warning warning-color fz30 vertical-middle mr20"></i>
<p class="inline-block vertical-middle w300">短信运营商限制：为避免骚扰用户，营销短信只允许在8点到22点发送</p>
......
src/views/message/addRecord.vue
......@@ -225,7 +225,7 @@ export default {
nowHour = new Date().getHours();
}
// TODO 编辑情况下的判断
if (this.smsType === 1 && (nowHour > 22 || nowHour < 8)) {
if (this.smsType === 1 && (nowHour >= 22 || nowHour < 8)) {
this.$alert(`<div>
<i class="el-icon-warning warning-color fz30 vertical-middle mr20"></i>
<p class="inline-block vertical-middle w300">短信运营商限制：为避免骚扰用户，营销短信只允许在8点到22点发送</p>
......
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